diff -Nru filezilla-3.14.1/configure filezilla-3.15.0.2/configure --- filezilla-3.14.1/configure 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/configure 2016-02-10 19:38:50.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.14.1. +# Generated by GNU Autoconf 2.69 for FileZilla 3.15.0.2. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='FileZilla' PACKAGE_TARNAME='filezilla' -PACKAGE_VERSION='3.14.1' -PACKAGE_STRING='FileZilla 3.14.1' +PACKAGE_VERSION='3.15.0.2' +PACKAGE_STRING='FileZilla 3.15.0.2' PACKAGE_BUGREPORT='tim.kosse@filezilla-project.org' PACKAGE_URL='https://filezilla-project.org/' @@ -705,6 +705,8 @@ WX_CFLAGS WX_CPPFLAGS WX_CONFIG_PATH +LIBFILEZILLA_LIBS +LIBFILEZILLA_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -875,6 +877,8 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +LIBFILEZILLA_CFLAGS +LIBFILEZILLA_LIBS LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS LIBDBUS_CFLAGS @@ -1423,7 +1427,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.14.1 to adapt to many kinds of systems. +\`configure' configures FileZilla 3.15.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1493,7 +1497,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FileZilla 3.14.1:";; + short | recursive ) echo "Configuration of FileZilla 3.15.0.2:";; esac cat <<\_ACEOF @@ -1565,6 +1569,10 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + LIBFILEZILLA_CFLAGS + C compiler flags for LIBFILEZILLA, overriding pkg-config + LIBFILEZILLA_LIBS + linker flags for LIBFILEZILLA, overriding pkg-config LIBGNUTLS_CFLAGS C compiler flags for LIBGNUTLS, overriding pkg-config LIBGNUTLS_LIBS @@ -1648,7 +1656,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FileZilla configure 3.14.1 +FileZilla configure 3.15.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2275,7 +2283,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.14.1, which was +It was created by FileZilla $as_me 3.15.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3141,7 +3149,7 @@ # Define the identity of the package. PACKAGE='filezilla' - VERSION='3.14.1' + VERSION='3.15.0.2' cat >>confdefs.h <<_ACEOF @@ -16205,7 +16213,7 @@ $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 $? "cannot figure our how to use std::atomic +as_fn_error $? "cannot figure out how to use std::atomic See \`config.log' for more details" "$LINENO" 5; } fi @@ -16452,6 +16460,87 @@ as_fn_error $? "pkg-config not found. pkg-config is required to check for some dependencies." "$LINENO" 5 fi + # Find libfilezilla + # ----------------- + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFILEZILLA" >&5 +$as_echo_n "checking for LIBFILEZILLA... " >&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 + 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` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBFILEZILLA_LIBS"; then + 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 + 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` + 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 + LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libfilezilla >= 0.3.0" 2>&1` + else + LIBFILEZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libfilezilla >= 0.3.0" 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 + +elif test $pkg_failed = untried; then + { $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 + +else + LIBFILEZILLA_CFLAGS=$pkg_cv_LIBFILEZILLA_CFLAGS + LIBFILEZILLA_LIBS=$pkg_cv_LIBFILEZILLA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + + # Detect wxWidgets # ---------------- @@ -16614,11 +16703,11 @@ if test -n "$wx_ver_ok"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 $as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs aui,xrc,adv,core,xml,net,base` + WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs aui,xrc,adv,core,xml,base` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 $as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs aui,xrc,adv,core,xml,net,base 2>/dev/null` + WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs aui,xrc,adv,core,xml,base 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16661,16 +16750,16 @@ fi if test "x$wx_has_cppflags" = x ; then - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags aui,xrc,adv,core,xml,net,base` + WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags aui,xrc,adv,core,xml,base` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS WX_CFLAGS_ONLY=$WX_CFLAGS WX_CXXFLAGS_ONLY=$WX_CFLAGS else - WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags aui,xrc,adv,core,xml,net,base` - WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags aui,xrc,adv,core,xml,net,base` - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags aui,xrc,adv,core,xml,net,base` + WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags aui,xrc,adv,core,xml,base` + WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags aui,xrc,adv,core,xml,base` + WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags aui,xrc,adv,core,xml,base` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"` @@ -20252,7 +20341,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.14.1, which was +This file was extended by FileZilla $as_me 3.15.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20319,7 +20408,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.14.1 +FileZilla config.status 3.15.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru filezilla-3.14.1/configure.ac filezilla-3.15.0.2/configure.ac --- filezilla-3.14.1/configure.ac 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/configure.ac 2016-02-10 19:27:09.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([FileZilla],[3.14.1],[tim.kosse@filezilla-project.org],[],[https://filezilla-project.org/]) +AC_INIT([FileZilla],[3.15.0.2],[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) @@ -130,13 +130,22 @@ 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/]) + ]) + AC_SUBST(LIBFILEZILLA_CFLAGS) + AC_SUBST(LIBFILEZILLA_LIBS) + + # Detect wxWidgets # ---------------- AM_OPTIONS_WXCONFIG MIN_WX_VERSION="3.0.2" - AM_PATH_WXCONFIG([$MIN_WX_VERSION], [wxWin=1], , [aui,xrc,adv,core,xml,net,base], [--unicode=yes --universal=no]) + 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([ wxWidgets must be installed on your system diff -Nru filezilla-3.14.1/data/filezilla.appdata.xml filezilla-3.15.0.2/data/filezilla.appdata.xml --- filezilla-3.14.1/data/filezilla.appdata.xml 2015-01-03 11:35:55.000000000 +0000 +++ filezilla-3.15.0.2/data/filezilla.appdata.xml 2016-02-05 08:54:45.000000000 +0000 @@ -1,6 +1,6 @@ - + filezilla.desktop CC0-1.0 diff -Nru filezilla-3.14.1/data/install.nsi.in filezilla-3.15.0.2/data/install.nsi.in --- filezilla-3.14.1/data/install.nsi.in 2015-08-22 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/data/install.nsi.in 2016-02-05 08:54:45.000000000 +0000 @@ -1057,6 +1057,13 @@ SetOutPath "$INSTDIR" CreateShortCut "$DESKTOP\FileZilla Client.lnk" "$INSTDIR\filezilla.exe" "" "$INSTDIR\filezilla.exe" 0 + ${If} ${AtLeastWin7} + ; Setting AppID + push "FileZilla.Client.AppID" + push "$DESKTOP\FileZilla Client.lnk" + nsis_appid::set_appid + ${EndIf} + ${MementoSectionEnd} ${MementoSectionDone} diff -Nru filezilla-3.14.1/data/Makefile.in filezilla-3.15.0.2/data/Makefile.in --- filezilla-3.14.1/data/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/data/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -206,6 +206,8 @@ 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@ diff -Nru filezilla-3.14.1/debian/changelog filezilla-3.15.0.2/debian/changelog --- filezilla-3.14.1/debian/changelog 2016-01-04 22:51:48.000000000 +0000 +++ filezilla-3.15.0.2/debian/changelog 2016-03-08 22:15:50.000000000 +0000 @@ -1,8 +1,33 @@ -filezilla (3.14.1-1u1~ppa1) wily; urgency=low +filezilla (3.15.0.2-1u1~ppa1) wily; urgency=low * Backported from Xenial. - -- Nate Muench Mon, 04 Jan 2016 16:51:15 -0600 + -- Nate Muench Tue, 08 Mar 2016 16:15:32 -0600 + +filezilla (3.15.0.2-1ubuntu1) 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 + + -- Gianfranco Costamagna Wed, 24 Feb 2016 12:30:55 +0100 + +filezilla (3.15.0.2-1) unstable; urgency=medium + + [ Adrien Cunin ] + * New upstream release + * Removed debian/patches/02_PIPE_BUF.patch, included upstream + * Added libfilezilla-dev build-dep + + [ Gianfranco Costamagna ] + * Upload to unstable + * Bump std-version to 3.9.7, no changes required. + * Patch refresh. + * Refactor copyright in machine-readable format. + * run wrap and sort to clean up the Debian packaging. + * Fix unsecure VCS fields. + + -- Adrien Cunin Wed, 17 Feb 2016 15:57:41 +0100 filezilla (3.14.1-1ubuntu1) xenial; urgency=low diff -Nru filezilla-3.14.1/debian/control filezilla-3.15.0.2/debian/control --- filezilla-3.14.1/debian/control 2015-12-16 15:50:09.000000000 +0000 +++ filezilla-3.15.0.2/debian/control 2016-02-25 10:01:11.000000000 +0000 @@ -2,18 +2,30 @@ Section: net Priority: optional Maintainer: Adrien Cunin -Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, dh-autoreconf, - libwxgtk3.0-dev, wx-common, libgtk2.0-dev, - gettext, libgnutls28-dev (>= 3.1.12), imagemagick, libdbus-1-dev, - libpugixml-dev (>= 1.5), libsqlite3-dev -Standards-Version: 3.9.6 -Homepage: http://filezilla-project.org/ -Vcs-Git: git://anonscm.debian.org/collab-maint/filezilla.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/filezilla.git +Build-Depends: autotools-dev, + debhelper (>= 9), + dh-autoreconf, + gettext, + imagemagick, + libdbus-1-dev, + libfilezilla-dev (>= 0.3.0), + libgnutls28-dev (>= 3.1.12), + libgtk2.0-dev, + libpugixml-dev (>= 1.5), + libsqlite3-dev, + libwxgtk3.0-dev, + pkg-config, + wx-common +Standards-Version: 3.9.7 +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 Package: filezilla Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, filezilla-common (= ${source:Version}) +Depends: filezilla-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Recommends: xdg-utils Description: Full-featured graphical FTP/FTPS/SFTP client FileZilla is a full-featured FTP client with an easy-to-use GUI. @@ -43,7 +55,7 @@ Package: filezilla-common Architecture: all Depends: ${misc:Depends} -Replaces: filezilla-locales, filezilla (<< 3.2.7.1-1) +Replaces: filezilla (<< 3.2.7.1-1), filezilla-locales Conflicts: filezilla-locales Description: Architecture independent files for filezilla FileZilla is a full-featured FTP client with an easy-to-use GUI. diff -Nru filezilla-3.14.1/debian/copyright filezilla-3.15.0.2/debian/copyright --- filezilla-3.14.1/debian/copyright 2015-12-16 15:50:09.000000000 +0000 +++ filezilla-3.15.0.2/debian/copyright 2016-02-25 09:44:13.000000000 +0000 @@ -1,103 +1,101 @@ -This package was debianized by Adam Cécile (Le_Vert) on -Tue, 19 Sep 2006 17:33:36 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: http://filezilla-project.org/ -It was downloaded from http://filezilla-project.org/ - -Upstream Author: Tim Kosse (Project Leader) - -Copyright: © 2004-2009 Tim Kosse - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -All files except those listed below are distributed under the GPL with the -copyright above. - - - -"src/tinyxml/*" are © 2000-2006 Lee Thomason -and distributed under Zlib license: - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any - damages arising from the use of this software. - - Permission is granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product documentation - would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and - must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. - - -"src/putty/*" are © 1997-2008 Simon Tatham and distributed under -MIT license: - -Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, -Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, -Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, and CORE SDI S.A. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - 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 NONINFRINGEMENT. IN NO EVENT SHALL SIMON - TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -"src/putty/sshcrcda.c" is © 1998 CORE SDI S.A., Buenos Aires, Argentina. -and distributed under terms of the license below: - - All rights reserved. Redistribution and use in source and binary - forms, with or without modification, are permitted provided that - this copyright notice is retained. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR - CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS - SOFTWARE. - - -"src/include/threadex.h" and "src/engine/threadex.cpp" are © 2006 Tim Kosse -and distributed under MIT license. - - - -The Debian packaging is © 2006-2009, Adam Cécile (Le_Vert) - © 2008-2009, Adrien Cunin -and is licensed under the GPL, see above. +Files: * +Copyright: 2004-2016 Tim Kosse +License: GPL-2+ + +Files: m4/cxx_compile_stdcxx_14.m4 +Copyright: 2008 Benjamin Kosnik + 2012 Zack Weinberg + 2013 Roy Stogner + 2014, 2015 Google Inc.; contributed by Alexey Sokolov + 2015-2016 Tim Kosse + 1994-2013 Free Software Foundation + 2008 Guido U. Draheim + 2011 Maarten Bosmans +License: permissive + +Files: src/putty/* +Copyright: 1997-2016 Simon Tatham + 2004-2016 Tim Kosse + the PuTTY team +License: MIT + +Files: src/putty/sshcrcda.c +Copyright: 1998 CORE SDI S.A., Buenos Aires, Argentina. + Simon Tatham (some modifications) +License: BSD-like + +Files: src/pugixml/* +Copyright: 2006-2015 Arseny Kapoulkine (arseny.kapoulkine@gmail.com) + 2003 Kristen Wegner (kristen@tima.net) +License: MIT + +Files: src/dbus/wxdbus* +Copyright: 2007 Andrei Borovsky +License: MIT + +Files: debian/* +Copyright: 2006-2009 Adam Cécile (Le_Vert) + 2008-2009 Adrien Cunin + 2016 Gianfranco Costamagna +License: GPL-2+ + +License: MIT + Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, + Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, + Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, CORE SDI S.A, and + Free Software Foundation + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + 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 NONINFRINGEMENT. IN NO EVENT SHALL SIMON + TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: BSD-like + All rights reserved. Redistribution and use in source and binary + forms, with or without modification, are permitted provided that + this copyright notice is retained. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR + CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS + SOFTWARE. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: permissive + 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. diff -Nru filezilla-3.14.1/debian/filezilla.install filezilla-3.15.0.2/debian/filezilla.install --- filezilla-3.14.1/debian/filezilla.install 2015-12-16 15:50:09.000000000 +0000 +++ filezilla-3.15.0.2/debian/filezilla.install 2016-02-25 09:44:13.000000000 +0000 @@ -1,4 +1,4 @@ usr/bin usr/share/applications -usr/share/pixmaps usr/share/man/man1 +usr/share/pixmaps diff -Nru filezilla-3.14.1/debian/patches/01_remove-xdg-check.patch filezilla-3.15.0.2/debian/patches/01_remove-xdg-check.patch --- filezilla-3.14.1/debian/patches/01_remove-xdg-check.patch 2015-12-16 15:50:09.000000000 +0000 +++ filezilla-3.15.0.2/debian/patches/01_remove-xdg-check.patch 2016-02-24 11:31:59.000000000 +0000 @@ -2,9 +2,9 @@ Description: make configure only warn if xdg-open is not present. Index: filezilla/configure.ac =================================================================== ---- filezilla.orig/configure.ac 2014-04-23 14:31:45.808705374 +0200 -+++ filezilla/configure.ac 2014-04-23 14:34:31.090577173 +0200 -@@ -462,7 +462,7 @@ +--- filezilla.orig/configure.ac ++++ filezilla/configure.ac +@@ -555,7 +555,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.14.1/debian/patches/02_PIPE_BUF.patch filezilla-3.15.0.2/debian/patches/02_PIPE_BUF.patch --- filezilla-3.14.1/debian/patches/02_PIPE_BUF.patch 2015-12-16 15:50:09.000000000 +0000 +++ filezilla-3.15.0.2/debian/patches/02_PIPE_BUF.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Author: Svante Signell -Description: define PIPE_BUF if necessary, fixes FTBFS on GNU/Hurd. ---- a/src/putty/unix/uxshare.c -+++ b/src/putty/unix/uxshare.c -@@ -23,6 +23,9 @@ - #define CONNSHARE_SOCKETDIR_PREFIX "/tmp/putty-connshare" - #define SALT_FILENAME "salt" - #define SALT_SIZE 64 -+#ifndef PIPE_BUF -+#define PIPE_BUF _POSIX_PIPE_BUF -+#endif - - /* - * Functions provided by uxnet.c to help connection sharing. diff -Nru filezilla-3.14.1/debian/patches/series filezilla-3.15.0.2/debian/patches/series --- filezilla-3.14.1/debian/patches/series 2015-12-17 10:17:50.000000000 +0000 +++ filezilla-3.15.0.2/debian/patches/series 2016-02-25 10:00:44.000000000 +0000 @@ -1,3 +1,2 @@ 01_remove-xdg-check.patch -02_PIPE_BUF.patch 11_use-decimal-si-by-default.patch diff -Nru filezilla-3.14.1/docs/filezilla.man filezilla-3.15.0.2/docs/filezilla.man --- filezilla-3.14.1/docs/filezilla.man 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/docs/filezilla.man 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -.TH filezilla 1 "January 2015" "" "FileZilla Manual" +.TH filezilla 1 "January 2016" "" "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\-2015 Tim Kosse +Copyright (C) 2004\-2016 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.14.1/docs/fzdefaults.xml.man filezilla-3.15.0.2/docs/fzdefaults.xml.man --- filezilla-3.14.1/docs/fzdefaults.xml.man 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/docs/fzdefaults.xml.man 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzdefaults.xml 5 "January 2015" "" "FileZilla Manual" +.TH fzdefaults.xml 5 "January 2016" "" "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\-2015 Tim Kosse +Copyright (C) 2004\-2016 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.14.1/docs/fzputtygen.man filezilla-3.15.0.2/docs/fzputtygen.man --- filezilla-3.14.1/docs/fzputtygen.man 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/docs/fzputtygen.man 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzputtygen 1 "January 2015" "" "FileZilla Manual" +.TH fzputtygen 1 "January 2016" "" "FileZilla Manual" .SH NAME fzputtygen \- SFTP private key converter of FileZilla .SH DESCRIPTION @@ -10,7 +10,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\-2015 Tim Kosse +Copyright (C) 2004\-2016 Tim Kosse .br Copyright (C) 1997\-2015 Simon Tatham and the PuTTY team .P diff -Nru filezilla-3.14.1/docs/fzsftp.man filezilla-3.15.0.2/docs/fzsftp.man --- filezilla-3.14.1/docs/fzsftp.man 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/docs/fzsftp.man 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -.TH fzsftp 1 "January 2015" "" "FileZilla Manual" +.TH fzsftp 1 "January 2016" "" "FileZilla Manual" .SH NAME fzsftp \- SFTP connection handler of FileZilla .SH DESCRIPTION @@ -10,7 +10,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\-2015 Tim Kosse +Copyright (C) 2004\-2016 Tim Kosse .br Copyright (C) 1997\-2015 Simon Tatham and the PuTTY team .P diff -Nru filezilla-3.14.1/INSTALL filezilla-3.15.0.2/INSTALL --- filezilla-3.14.1/INSTALL 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/INSTALL 2016-02-05 08:54:45.000000000 +0000 @@ -6,6 +6,7 @@ --------------- FileZilla depends on the following libraries: +- libfilezilla 0.3.0 or greater - wxWidgets 3.0.2 or greater - libidn (only if not on Windows and not having gettaddrinfo with AI_IDN support) - GnuTLS 3.1.12 or greater diff -Nru filezilla-3.14.1/locales/ar.po filezilla-3.15.0.2/locales/ar.po --- filezilla-3.14.1/locales/ar.po 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/locales/ar.po 2016-02-05 08:54:45.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: FileZilla3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:13+0200\n" -"PO-Revision-Date: 2015-09-18 22:52+0300\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" "Language-Team: Awadh Al-Ghaamdi \n" "Language: ar\n" @@ -16,7 +16,7 @@ "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.4\n" +"X-Generator: Poedit 1.8.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 @@ -238,7 +238,7 @@ msgid "%w - Proxy password" msgstr "%w - كلمة مرور الملقم الوكيل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&قطع الإتصال السابق و الإتصال في تبويب جديد" @@ -291,7 +291,7 @@ msgid "&Always use default editor" msgstr "&دائما إستخدام المحرر الإفتراضي" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "دائما أ&ستخدم التحديد للملفات الغير مشروكة" @@ -329,9 +329,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 @@ -344,8 +344,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" @@ -418,14 +418,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 "&حذف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&حذف الرابط الترميزي" @@ -463,7 +463,7 @@ msgid "&Display size in bytes" msgstr "عرض ال&حجم بالبايت" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&عدم تذكر كلمات المرور (مستحسن)" @@ -484,7 +484,7 @@ msgid "&Download" msgstr "ت&حميل" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "التحميل &إلى:" @@ -517,7 +517,7 @@ msgid "&Enable compression" msgstr "تمكين &الضغط" -#: ../../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 "ت&مكين حدود السرعة" @@ -534,7 +534,7 @@ msgid "&Enter custom command..." msgstr "إدخال &أمر مخصص..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "تأسيس الإتصال في تبويب &جديد" @@ -587,14 +587,14 @@ msgid "&Finish editing and delete local file" msgstr "إ&نتهاء تحرير و حذف الملف المحلي" -#: ../../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 "" "ت&سطيح المسارات البعيدة ، تحميل كافة الملفات المحتوية مباشرة إلى المجلد الهدف" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "تتبع &الرابط الترميزي ، حذف محتويات المجلد الهدف" @@ -657,7 +657,7 @@ msgid "&Install new version" msgstr "تثبيت &الإصدار الجديد" -#: ../../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 "إ&بقاء تركيبة المسار البعيد مقارب إلى جذر البحث" @@ -682,7 +682,7 @@ msgstr "ت&فرع المجلد المحلى" #: ../../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 "ال&مجلد المحلى:" @@ -773,7 +773,7 @@ msgstr "ال&قيمة العددية:" #: ../../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 "&حسنا" @@ -850,12 +850,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "تذكر &كلمة المرور إلى أن يتم إغلاق FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "ال&مجلد البعيد:" @@ -876,7 +876,7 @@ msgstr "إزالة المحددة" #: ../../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 @@ -937,7 +937,7 @@ msgid "&Save as..." msgstr "حفظ &باسم..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&بحث" @@ -1006,7 +1006,7 @@ msgid "&Speed limits" msgstr "&حدود السرعة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&بدء الإرسال فورا" @@ -1061,7 +1061,7 @@ msgid "&Uploads:" msgstr "عمليات ال&رفع:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "إ&ستخدام برنامج مخصص" @@ -1222,8 +1222,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 @@ -1469,7 +1469,7 @@ msgid "Active mode IP" msgstr "IP النمط النشط" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "إ&ضافة الملفات فقط إلى قائمة الإنتظار" @@ -1510,7 +1510,7 @@ "متوقع، وقد تؤدي حتى إلى تلف النظام الخاص بك. وبالتالي فإن استخدام هذه " "الإصدارات يكون على مسؤوليتك الخاصة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "دائما تنفيذ هذا الإجراء:" @@ -1545,7 +1545,7 @@ 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 "متصل مسبقا" @@ -1683,7 +1683,7 @@ msgid "Ask your operating system for the external IP address" msgstr "سؤال نظام التشغيل الخاص بك عن عنوان IP خارجي" -#: ../../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" @@ -1736,7 +1736,7 @@ msgid "Bad file descriptor" msgstr "واصف ملف غير صالح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "تعليمات الإستخدام الأساسية" @@ -1749,7 +1749,7 @@ msgid "Being edited" msgstr "يتم التحرير" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1111 msgid "Beware! Certificate has been revoked" msgstr "أنتبه! تم إبطال الشهادة" @@ -1767,11 +1767,11 @@ 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 "عناوين مفضلة" @@ -1859,13 +1859,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 "إلغاء الأمر" @@ -2270,7 +2270,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 "حالة الشروط &حساسة" @@ -2286,7 +2286,7 @@ 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 و شبكتك" @@ -2560,7 +2560,7 @@ msgid "Could not generate custom login sequence." msgstr "تعذر توليد سلسلة تسجيل الدخول المخصصة" -#: ../../locales/../src/engine/tlssocket.cpp:934 +#: ../../locales/../src/engine/tlssocket.cpp:956 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2568,7 +2568,7 @@ "لا يمكن الحصول على الإسم الفارق من ناشر الشهادة , فشل " "gnutls_x509_get_issuer_dn" -#: ../../locales/../src/engine/tlssocket.cpp:911 +#: ../../locales/../src/engine/tlssocket.cpp:933 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2589,11 +2589,11 @@ msgid "Could not get temporary directory to download file into." msgstr "تعذر الحصول على المجلد المؤقت لتحميل معلومات الملف" -#: ../../locales/../src/engine/tlssocket.cpp:857 +#: ../../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:852 +#: ../../locales/../src/engine/tlssocket.cpp:874 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2900,6 +2900,10 @@ msgid "D&elete" msgstr "&حذف" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "مقارنة &المجلدات" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "ت&عطيل الكل" @@ -2913,7 +2917,7 @@ msgstr "إجراء ال&نقرة المزدوجة على المجلدات :" #: ../../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 "ت&كرار" @@ -3057,7 +3061,7 @@ msgid "Deleting multiple unrelated directories is not yet supported" msgstr "لم يتم بعد دعم الحذف للمجلدات المتعددة الغير مرتبطة" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "حذف الرابط الترميزي" @@ -3091,7 +3095,7 @@ 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 @@ -3224,7 +3228,7 @@ msgid "Do you want to reopen this file?" msgstr "هل تريد فعلا إعادة فتح هذا الملف؟" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "وثائق تعليمات" @@ -3244,7 +3248,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 "حدود التحميل&:" @@ -3258,7 +3262,7 @@ msgid "Download limit: none" msgstr "حدود التحميل : بدون" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3103 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 #: ../../locales/../src/interface/search.cpp:518 #: ../../locales/../src/interface/search.cpp:523 msgid "Download search results" @@ -3443,7 +3447,7 @@ msgid "Enter &custom command..." msgstr "إدخال أمر &مخصص..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "أدخل 0 للسرعة الغير المحدودة" @@ -3841,7 +3845,7 @@ msgid "Failed to validate settings" msgstr "فشل في التحقق من الإعدادات" -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../locales/../src/engine/tlssocket.cpp:1105 msgid "Failed to verify peer certificate" msgstr "فشل في التحقق من شهادة النظير" @@ -3973,7 +3977,7 @@ 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" @@ -4100,11 +4104,11 @@ msgid "Filter validation failed" msgstr "فشل التحقق من المرشح" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "&بحث عن ملفات" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "بحث &عن مجلدات" @@ -4171,7 +4175,7 @@ msgid "Found new %s %s\n" msgstr "الجديد المكتشف %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "تعليمات موسعة" @@ -4192,7 +4196,7 @@ msgid "Get external IP address from the following URL:" msgstr "الحصول على عنوان IP خارجي من الرابط التالي :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "الحصول على تعليمات" @@ -4205,22 +4209,22 @@ msgid "Global bookmarks" msgstr "عناوين مفضلة شاملة" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:210 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS خطأ %d" -#: ../../locales/../src/engine/tlssocket.cpp:190 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS خطأ %d في %s" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS خطأ %d في %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:204 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS خطأ %d: %s" @@ -4377,7 +4381,7 @@ "عند وصول حجم ملف السجل إلى الحد ، يتم تسميته بإضافة \"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." @@ -4542,7 +4546,7 @@ "فى النمط السلبي الذى ينصح به لمعظم المستخدمين . البرنامج يسأل الخادم من أجل " "منفذ و يتصل بالمنفذ المعطى له , حيث لا يوجد الكثير من الضبط يجب عمله هنا" -#: ../../locales/../src/engine/tlssocket.cpp:1095 +#: ../../locales/../src/engine/tlssocket.cpp:1117 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4565,9 +4569,8 @@ msgstr "جاري تهيئة TLS..." #: ../../locales/../src/interface/verifycertdialog.cpp:107 -#, fuzzy msgid "Insecure algorithm!" -msgstr "خوارزمية التواقيع:" +msgstr "خوارزمية غير آمنة" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 msgid "Insecure server, it does not support FTP over TLS." @@ -4958,15 +4961,15 @@ 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 "عدم مطابقة ما يلي" @@ -5087,7 +5090,7 @@ msgid "New &tab" msgstr "&تبويب جديد" -#: ../../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 "&عنوان مفضل جديد" @@ -5187,11 +5190,11 @@ 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'" @@ -5309,13 +5312,13 @@ #: ../../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" @@ -5818,7 +5821,7 @@ "من فضلك قم بتشغيل المعالج مرة ثانية فى حالة تغيير فى بيئة الشبكة أو فى حالة " "حدوث مشاكل مع الخوادم التي كانت تعمل سابقا" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "الرجاء تحديد إجراء :" @@ -5897,7 +5900,7 @@ msgid "Preview:" msgstr "معاينة:" -#: ../../locales/../src/engine/tlssocket.cpp:1112 +#: ../../locales/../src/engine/tlssocket.cpp:1134 msgid "Primary connection and data connection certificates don't match." msgstr "شهادة الإتصال الرئيسية و شهادة إتصال البيانات غير متطابقتين" @@ -6042,7 +6045,7 @@ msgid "Queued files" msgstr "ملفات في الإنتظار" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "وضع بالإنتظار:" @@ -6147,18 +6150,18 @@ msgid "Rec&urse into subdirectories" msgstr "التكرار &ضمن المجلدات الفرعية" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:223 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "تلقي تنبيه TLS من الملقم: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2958 +#: ../../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:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "تلقى خط تتجاوز 10000 حرف ، مقاطعة" @@ -6172,7 +6175,7 @@ msgid "Received invalid character in version information" msgstr "استقبال حرف غير صالح في معلومات الإصدار" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket.cpp:226 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "تلقي تنبيه TLS غير معروف %d من الملقم" @@ -6226,7 +6229,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 "تذكر كلمات المرور ؟" @@ -6234,7 +6237,7 @@ msgid "Remote" msgstr "بعيد" -#: ../../locales/../src/engine/tlssocket.cpp:830 +#: ../../locales/../src/engine/tlssocket.cpp:852 msgid "Remote certificate not trusted." msgstr "الشهادة البعيدة غير موثوق بها" @@ -6243,7 +6246,7 @@ msgid "Remote file" msgstr "الملف البعيد" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3099 +#: ../../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 @@ -6287,7 +6290,7 @@ 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 "معالجة المسار البعيد :" @@ -6333,7 +6336,7 @@ 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 "التبليغ عن أخطاء و طلب إضافة وظيفة ما" @@ -6384,7 +6387,7 @@ msgid "Response:" msgstr "الإستجابة:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "النتائج :" @@ -6432,7 +6435,7 @@ msgid "S&hutdown system" msgstr "إ&غلاق الكمبيوتر" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "إ&يقاف" @@ -6483,11 +6486,11 @@ 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 "&شروط البحث:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "&مجلد البحث :" @@ -6582,7 +6585,7 @@ msgid "Select filename for converted key file" 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 "تحديد كيفية فتح هذه الملفات" @@ -6732,7 +6735,7 @@ msgid "Server &Type:" msgstr "نوع ال&خادم:" -#: ../../locales/../src/engine/tlssocket.cpp:719 +#: ../../locales/../src/engine/tlssocket.cpp:741 msgid "Server did not properly shut down TLS connection" msgstr "الخادم ربما لم يغلق إتصال TLS بشكل صحيح" @@ -7060,7 +7063,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" @@ -7162,7 +7165,7 @@ 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." @@ -7170,7 +7173,7 @@ "الروابط الترميزية إلى الملفات لا تتأثر بهذا الإختيار ، لأن الروابط الترميزية " "يتم حذفها دائما" -#: ../../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 @@ -7336,12 +7339,12 @@ 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'" @@ -7480,7 +7483,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 المصدر المجاني المفتوح" @@ -7904,7 +7907,7 @@ msgid "U&pload" msgstr "&رفع" -#: ../../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 "حدود الر&فع:" @@ -7914,8 +7917,9 @@ msgstr "إ&ستخدام إشراكات أنواع الملفات إذا توفرت" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "إستخدام إ&فتراضي النظام" +#, fuzzy +msgid "U&se system defaults for current language" +msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" @@ -7984,7 +7988,7 @@ "مالم يتم إصلاح هذه المشكلة , لن يعمل نمط FTP النشط و بالتالي سوف يستخدم " "النمط السلبي" -#: ../../locales/../src/engine/tlssocket.cpp:1074 +#: ../../locales/../src/engine/tlssocket.cpp:1096 msgid "Unsupported certificate type" msgstr "نوع شهادة غير مدعومة" @@ -8058,12 +8062,12 @@ msgid "Use &custom editor:" msgstr "إ&ستخدام محرر مخصص:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "إستخدام المحرر الإ&فتراضي للملفات النصية" #: ../../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 "إستخدام ال&تصفح المتزامن" @@ -8090,8 +8094,9 @@ msgstr "إستخدام الخادم من مدير الموقع" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "إستخدام إفتراضيات النظام" +#, fuzzy +msgid "Use system &defaults for current language" +msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8149,7 +8154,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "رسائل سجل مطولة من wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1124 +#: ../../locales/../src/engine/tlssocket.cpp:1146 msgid "Verifying certificate..." msgstr "جاري فحص الشهادة..." @@ -8215,11 +8220,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 "ما هو الجديد" @@ -8227,7 +8232,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." @@ -8252,7 +8257,7 @@ 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 كلمة المرور هذه ؟" @@ -8283,7 +8288,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 "يمكنك فتح هذه اللائحة مرة ثانية خلال قائمة تعليمات" @@ -8318,7 +8323,7 @@ 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 "أنت قمت بتحديد رابط ترميزي واحد على الأقل" @@ -8519,7 +8524,7 @@ msgid "fzsftp could not be started" msgstr "fzsftp غير قادر على تشغيل" -#: ../../locales/../src/engine/tlssocket.cpp:1103 +#: ../../locales/../src/engine/tlssocket.cpp:1125 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers لم يرجع بشهادات" @@ -8576,9 +8581,9 @@ msgstr "ملف قابل للكتابة للمالك" #: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1167 -#: ../../locales/../src/engine/tlssocket.cpp:1178 -#: ../../locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 msgid "unknown" msgstr "غير معروف" @@ -8599,6 +8604,12 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "U&se system defaults" +#~ msgstr "إستخدام إ&فتراضي النظام" + +#~ msgid "Use system &defaults" +#~ msgstr "إستخدام إفتراضيات النظام" + #~ msgid "" #~ "Enter the password for the file '%s'.\n" #~ "Please note that the converted file will not be password protected." diff -Nru filezilla-3.14.1/locales/co.po filezilla-3.15.0.2/locales/co.po --- filezilla-3.14.1/locales/co.po 2015-03-29 10:21:12.000000000 +0000 +++ filezilla-3.15.0.2/locales/co.po 2016-02-05 08:54:45.000000000 +0000 @@ -7,18 +7,18 @@ msgstr "" "Project-Id-Version: FileZilla in Corsican\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-16 16:47+0100\n" -"PO-Revision-Date: 2015-03-21 19:52+0100\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" +"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.7.5\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 @@ -50,9 +50,9 @@ msgstr[0] "%d cartulare" msgstr[1] "%d cartulari" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:453 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../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" @@ -61,9 +61,9 @@ #: ../../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/RemoteListView.cpp:1385 +#: ../../locales/../src/interface/search.cpp:483 +#: ../../locales/../src/interface/search.cpp:742 #, c-format msgid "%d file" msgid_plural "%d files" @@ -84,12 +84,12 @@ msgstr[0] "%d schedariu. Dimensione tutale : almenu %s" msgstr[1] "%d schedarii. Dimensione tutale : almenu %s" -#: ../../locales/../src/interface/QueueView.cpp:2797 +#: ../../locales/../src/interface/QueueView.cpp:2778 #, c-format msgid "%d files added to queue" -msgstr "%d schedarii aghjunti à a lista d'aspettanza" +msgstr "%d schedarii aghjunti à a lista d'attesa" -#: ../../locales/../src/engine/ControlSocket.cpp:101 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -100,6 +100,20 @@ msgid "%h - Host" msgstr "%h - Ospite" +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#, 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 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu schedariu" +msgstr[1] "%llu schedarii" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" @@ -115,15 +129,15 @@ msgid "%s (? B/s)" msgstr "%s (? O/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:44 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificatu scadutu !" -#: ../../locales/../src/interface/verifycertdialog.cpp:31 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" -msgstr "%s - Mancu leghjittimu !" +msgstr "%s - Mancu accettevule !" #: ../../locales/../src/interface/resources/xrc/settings.xrc:532 #, c-format @@ -140,14 +154,14 @@ msgid "%s and %s. Total size: At least %s" msgstr "%s è %s. Dimensione tutale : almenu %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:72 +#: ../../locales/../src/engine/sizeformatting_base.cpp:66 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s ottettu" msgstr[1] "%s ottetti" -#: ../../locales/../src/interface/FileZilla.cpp:670 +#: ../../locales/../src/interface/FileZilla.cpp:617 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -162,7 +176,7 @@ "Ci vole à telecaricà torna FileZilla. S'è u prublemu rivene, mandate puru un " "'bug report'." -#: ../../locales/../src/interface/FileZilla.cpp:755 +#: ../../locales/../src/interface/FileZilla.cpp:702 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -180,7 +194,7 @@ "d'ambiente PATH (passeghju).\n" "- Scrivite u passeghju sanu di %s in a variabile d'ambiente FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:60 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s cù %d bits" @@ -194,7 +208,7 @@ msgid "%w - Proxy password" msgstr "%w - Parolla d'intrata di u proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "" "&Abandunnà a cunnessione precedente è cunnettassi in l'unghjetta currente" @@ -203,14 +217,14 @@ msgid "&About..." msgstr "&Apprupositu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../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 "&Contu :" #: ../../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:448 msgid "&Active" msgstr "&Attivu" @@ -221,18 +235,18 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:245 #: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" -msgstr "&Aghjunghje i schedarii à a lista d'aspettanza" +msgstr "&Aghjunghje i schedarii à a lista d'attesa" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Aghjunghje schedariu di chjave..." +msgid "&Add key file..." +msgstr "&Aghjunghje un schedariu di chjave..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" -msgstr "&Aghjunghje à a lista d'aspettanza" +msgstr "&Aghjunghje à a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "&Regulà u fusu orariu di u servu :" @@ -240,7 +254,7 @@ msgid "&Always trust certificate in future sessions." msgstr "Sempre fà fid&anza à stu certificatu in l'altre sessioni." -#: ../../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 "Sempre fà fid&anza à st'ospite, aghjunghje sta chjave à u cache" @@ -248,7 +262,7 @@ msgid "&Always use default editor" msgstr "&Aduprate sempre l'editore predefinitu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Aduprate sempre una selezzione per i schedarii micca assuciati" @@ -261,17 +275,17 @@ msgstr "Dum&anda l'indirizzu IP esternu à u vostru sistemu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Automaticu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 msgid "&Autodetect" msgstr "Rilevazione &Automatica" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binariu" @@ -286,14 +300,14 @@ msgid "&Bookmarks" msgstr "&Indette" -#: ../../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/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:295 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 msgid "&Browse..." msgstr "&Sfuglià..." @@ -302,9 +316,9 @@ msgstr "Tolleranza di &burst :" #: ../../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: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" @@ -312,7 +326,7 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "&Sguassà i dati persunali..." +msgstr "&Squassà i dati persunali..." #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" @@ -322,7 +336,7 @@ msgid "&Close FileZilla" msgstr "&Chjode FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Cunfigurà i limiti di velocità per i trasferimenti..." @@ -330,7 +344,7 @@ msgid "&Configure..." msgstr "&Cunfigurà..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "&Cunnettà" @@ -338,19 +352,19 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Cupià a cunnessione attuale ver di u Ghjestiunariu di Siti..." -#: ../../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:428 msgid "&Copy to clipboard" msgstr "&Cupià ver di u clipboard" #: ../../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:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 msgid "&Create directory" msgstr "&Creà unu cartulare" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "&Creà una nova unghjetta" @@ -375,24 +389,37 @@ msgid "&Delay between failed login attempts:" msgstr "&Tempu frà e prove fiasche di login :" -#: ../../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:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" -msgstr "&Sguassà" +msgstr "&Squassà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" -msgstr "&Sguassà a leia simbolica (symlink)" +msgstr "&Squassà a leia simbolica (symlink)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" msgstr "&Paragone di cartulare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:887 +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 +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 msgid "&Discard local file then download and edit file anew" msgstr "Scaccià u schedariu lucale è &dopu telecaricallu è mudificallu" @@ -414,7 +441,7 @@ msgid "&Display size in bytes" msgstr "&Affissà a dimensione in ottetti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Ùn micca arricurdassi di e parolle d'intrata (ricumandatu)" @@ -431,19 +458,19 @@ msgstr "Azzione di u &dopiu-cliccu nantu à i schedarii :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "&Telecaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Telecaricà ver di :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "&Telecaricà..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Telecaricamenti :" @@ -453,14 +480,14 @@ msgid "&Edit" msgstr "&Mudificà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "&Mudificà e regule di filtru..." #: ../../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:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" msgstr "P&ermette" @@ -468,12 +495,12 @@ msgid "&Enable compression" msgstr "&Attivà a cumpressione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../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:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "&Cudificazione :" @@ -481,11 +508,11 @@ msgid "&Encryption:" msgstr "&Cifratura :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "Scrivite una cummanda p&ersunalizata..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Stabilisc&e a cunnessione in una nova unghjetta" @@ -493,12 +520,12 @@ msgid "&Execute" msgstr "&Eseguisce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 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:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." msgstr "&Espurtà..." @@ -510,7 +537,7 @@ msgid "&File" msgstr "&Schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Pruprietà di u schedariu..." @@ -518,27 +545,27 @@ msgid "&File permissions..." msgstr "&Diritti d'impiegu di u schedariu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Schedariu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "Cundizioni di u &filtru :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "Gruppi di &filtri :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtri :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" msgstr "&Finisce a mudificazione è scaccià u schedariu lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -546,10 +573,10 @@ "Passeghji alluntanati micca strutturati, telecarica tutti i schedarii " "cuntenuti dentru, ver di u cartulare di destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "" -"&Seguitate a leia simbolica (symlink), sguassà i cuntenuti di i cartulari di " +"&Seguitate a leia simbolica (symlink), squassà i cuntenuti di i cartulari di " "destinazione" #: ../../locales/../src/interface/resources/xrc/settings.xrc:367 @@ -560,7 +587,7 @@ msgid "&Getting help..." msgstr "&Ottene un aiutu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "Indetta &glubale" @@ -573,7 +600,7 @@ msgstr "Aiut&u" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Piattà i schedarii uguali" @@ -585,7 +612,7 @@ msgid "&Highest available port:" msgstr "&Portu u più maiò dispunibule :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 +#: ../../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:" @@ -611,11 +638,15 @@ msgid "&Install new version" msgstr "&Installà a nova versione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "" "Mentene a struttura di u passeghju alluntanatu di l'urigine di a ricerca" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "Schedariu di chjave :" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Piazzamentu di l'arburi di schedarii è di cartulari :" @@ -624,7 +655,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Limità i porti lucali aduprati da FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "&Limità u numeru di cunnessioni simultanei" @@ -632,8 +663,8 @@ msgid "&Local directory tree" msgstr "Arburiscenza di u cartulare &lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "Cartulare &lucale :" @@ -641,11 +672,11 @@ msgid "&Log to file" msgstr "Arregistrà u ghjurnale &Log in un schedariu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "Tipu d'accessu (&Logon) :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "Tipu d'accessu (&Logon) :" @@ -661,7 +692,7 @@ msgid "&Manual transfer..." msgstr "Trasferimentu &manuale..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "&Numeru massimu di cunnessioni :" @@ -681,7 +712,7 @@ msgid "&Name sorting mode:" msgstr "Nome di u modu di classificazione :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Nome :" @@ -689,7 +720,7 @@ msgid "&Network configuration wizard..." msgstr "&Assistente di cunfigurazione di a reta..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Novu" @@ -697,16 +728,16 @@ msgid "&New Site" msgstr "&Novu Situ" -#: ../../locales/../src/interface/Mainfrm.cpp:1736 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Nova versione dispunibule !" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Seguente >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&No" @@ -724,8 +755,8 @@ msgstr "&Valore numericu :" #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&OK" @@ -734,7 +765,7 @@ msgstr "&APRE" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" msgstr "&Apre" @@ -742,7 +773,7 @@ msgid "&Overwrite" msgstr "&Rimpiazzà" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Passivu" @@ -754,7 +785,7 @@ msgid "&Play sound" msgstr "&Sunà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 +#: ../../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:" @@ -764,9 +795,9 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Preservà a data è l'ora di i schedarii trasferiti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" -msgstr "&Lista d'aspettanza" +msgstr "&Lista d'attesa" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" @@ -776,6 +807,10 @@ msgid "&Quickconnect bar" msgstr "Barra di &Cunnessione Pronta" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "&Storia di Cunnessione Pronta" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Leghje" @@ -784,8 +819,12 @@ msgid "&Reconnect" msgstr "&Ricunnessione" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +msgid "&Reconnect information" +msgstr "&Infurmazione per &ricunnettassi" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" msgstr "&Attualizà" @@ -793,16 +832,16 @@ 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:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Arricurdassi di e parolle d'intrata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Cartulare di reta in là :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "&Passeghju di reta in là :" @@ -818,35 +857,35 @@ msgid "&Remove selected" msgstr "&Caccià selezziunati" -#: ../../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:2830 #: ../../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/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Rinumà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "&Rinumà..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "&Apre u schedariu lucale torna" #: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" -msgstr "&Rimpiazzà i caratteri micca leghjittimi cù :" +msgstr "&Rimpiazzà i caratteri micca accettevule cù :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." msgstr "&Riferisce un prublemu..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" -msgstr "&Riavvià è rimette tutti i schedarii in a lista d'aspettanza" +msgstr "&Riavvià è rimette tutti i schedarii in a lista d'attesa" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" @@ -876,11 +915,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "&Salvà cu u nome..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Ricerca" @@ -896,16 +935,16 @@ msgid "&Select language:" msgstr "&Sceglie a lingua :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "&Selezziunà e culonne chì ci vole à affissà :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "Ser&vu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "&Preferenze" @@ -917,7 +956,7 @@ msgid "&Show debug menu" msgstr "&Affissà u 'Menu' per spannà" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "&Affissà u ghjurnale cù ditaglii" @@ -929,11 +968,15 @@ msgid "&Show timestamps in message log" msgstr "&Affissà date è ore in u ghjurnale di i messaghji" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +msgid "&Site Manager entries" +msgstr "&Entrate di u Ghjestiunariu di Siti" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Ghjestiunariu di Siti..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Indetta particulare per stu situ" @@ -945,7 +988,7 @@ msgid "&Speed limits" msgstr "Limiti di &velocità" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Principià u trasferimentu avà" @@ -953,11 +996,11 @@ msgid "&Swap local and remote panes" msgstr "&Permutà i finestrini lucale è alluntanatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "Cudificazione &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Prova" @@ -969,13 +1012,14 @@ msgid "&Transfer" msgstr "&Trasferimentu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "&Modu di trasferimentu :" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" -msgstr "Lista d'aspettanza di &trasferimentu" +msgstr "Lista d'attesa di &trasferimentu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" @@ -983,29 +1027,29 @@ "&Trattà i schedarii chì anu un nome chì principia cù unu puntu cum'è " "schedarii ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "&Cancellà i cambiamenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "&Mudificà a chjave piattata per st'ospite" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Incaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Incaricamenti :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Impiegà un prugrammu persunalizatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "Impiegà &u sfugliendu sincrunizatu" @@ -1026,8 +1070,8 @@ msgstr "&Impiegà u separadore di mille" #: ../../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:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Utilizatore :" @@ -1035,7 +1079,7 @@ msgid "&Username:" msgstr "&Nome d'utilizatore :" -#: ../../locales/../src/interface/Mainfrm.cpp:1730 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Versione %s" @@ -1045,7 +1089,7 @@ msgstr "&Affissu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Affissu / Mudificà" @@ -1062,31 +1106,31 @@ msgid "&Write" msgstr "&Scrive" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "&Yes" msgstr "&Iè" -#: ../../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' ùn esiste micca o ùn pò micca esse accessu." -#: ../../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' ùn hè micca un cartulare." -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" msgstr "" "U tipu d'accessu 'Contu' ùn hè micca suppurtatu da u protocollu selezziunatu" -#: ../../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." @@ -1094,7 +1138,7 @@ "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:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1102,7 +1146,7 @@ "I tipi d'accessu 'Contu' è 'Nurmale' ùn sò micca dispunibule. L'elementu hè " "statu cambiatu cù 'Dumanda a parolla d'intrata'." -#: ../../locales/../src/interface/Mainfrm.cpp:611 +#: ../../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 " @@ -1146,8 +1190,8 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 per disattivà)" -#: ../../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 hè definitu à %d.%d)" @@ -1160,8 +1204,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(esempiu : %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 +#: ../../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 @@ -1208,7 +1252,7 @@ msgid "3 - Verbose" msgstr "3 - Verbosu" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" msgstr "sistema 32-bit" @@ -1216,11 +1260,11 @@ msgid "4 - Debug" msgstr "4 - Spannà" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:96 msgid "64-bit system" msgstr "sistema 64-bit" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Precedente" @@ -1228,7 +1272,7 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 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." @@ -1238,8 +1282,8 @@ msgstr "Ci vole à sceglie un editore predefinitu." #: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:736 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." @@ -1254,22 +1298,22 @@ "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:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." msgstr "Un schedariu dighjà apertu hè statu cambiatu." -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1644 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:1683 +#: ../../locales/../src/interface/edithandler.cpp:1648 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." -#: ../../locales/../src/interface/FileZilla.cpp:649 +#: ../../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 " @@ -1287,7 +1331,7 @@ msgid "A new version of FileZilla is available:" msgstr "Una nova versione di FileZilla hè dispunibule :" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../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." @@ -1304,7 +1348,7 @@ "Un servu ben cunfiguratu ùn hà bisognu di quessu. Ci vole à chjamà " "l'amministratore di u servu per verificà quessu." -#: ../../locales/../src/interface/state.cpp:283 +#: ../../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?" @@ -1315,7 +1359,7 @@ "cartulare lucale ?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1340,11 +1384,11 @@ msgid "A&pply to all files and directories" msgstr "Affetta tutti i schedarii è i cartulari" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "Cavà a&utomaticamente i trasferimenti riesciuti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1356,27 +1400,27 @@ msgid "Above the file lists" msgstr "Sopra e liste di schedarii" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../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: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/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 msgid "Account" msgstr "Contu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:375 msgid "Action after queue &completion" -msgstr "Azzione à fà quandu a lista d'aspettanza hè viota" +msgstr "Azzione à fà quandu a lista d'attesa hè viota" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "Azzione à fà nantu à u schedariu selezziunatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Azzione à eseguisce :" @@ -1388,7 +1432,7 @@ msgid "Active mode" msgstr "Modu attivu" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1396,7 +1440,7 @@ "A prova di u modu attivu FTP hè fiasca. FileZilla ùn cunnosce micca " "l'indirizzu IP esternu currettu." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1405,7 +1449,7 @@ "l'indirizzu IP esternu currettu. Di più, u vostru 'router' hà mudificatu " "l'indirizzu mandatu." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1419,33 +1463,33 @@ msgid "Active mode IP" msgstr "IP in modu attivu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" -msgstr "Aghjunghje i schedarii solu à a lista d'aspettanza" +msgstr "Aghjunghje i schedarii solu à a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../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 "" -"Aghjunghje u cartulare selezziunatu à a lista d'aspettanza di trasferimentu" +"Aghjunghje u cartulare selezziunatu à a lista d'attesa di trasferimentu" #: ../../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 "" -"Aghjunghje i cartulari è i schedarii selezziunati à a lista d'aspettanza di " +"Aghjunghje i cartulari è i schedarii selezziunati à a lista d'attesa di " "trasferimentu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" -msgstr "Aghjunghje à a lista d'aspettanza" +msgstr "Aghjunghje à a lista d'attesa" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Tipu d'indirizzu micca suppurtatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Espertu" @@ -1463,15 +1507,15 @@ "funziunà cum'è previstu, è dannighjà u vostru sistemu dinù. L'impiegu di ste " "versioni di FileZilla si face à u vostru risicu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Eseguisce sempre st'azzione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Cudificazione :" -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Tutti i schedarii anu statu trasferiti bè" @@ -1480,7 +1524,7 @@ msgstr "" "Tutti i porti di a stesa specificata devenu esse scelti trà 1024 è 65535." -#: ../../locales/../src/interface/QueueView.cpp:2975 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1497,11 +1541,11 @@ 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:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Dighjà cunnettu" -#: ../../locales/../src/interface/verifycertdialog.cpp:81 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nome alternativu :" @@ -1531,27 +1575,27 @@ "Un altra manera hè di telecaricà l'ultima versione di FileZilla da u situ " "Web :" -#: ../../locales/../src/interface/QueueView.cpp:1925 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, 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'aspettanza di " +"Un errore s'hè affacatu mentre 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:1830 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, 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'aspettanza di " +"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." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1559,42 +1603,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: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: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 "Anonimu" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:937 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:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 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/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"I cambiamenti fatti in u Ghjestiunariu di Siti ùn ponu micca esse " -"arregistrati osinnò ci vole à riparà i schedariu." - #: ../../locales/../src/interface/filter.cpp:213 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:971 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "I cambiamenti fatti à i filtri ùn seranu micca arregistrati." @@ -1602,13 +1638,13 @@ msgid "App&ly to directories only" msgstr "Affettà so&lu i cartulari" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Affettà" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" -msgstr "Affettà solu a lista d'aspettanza ¤te" +msgstr "Affettà solu a lista d'attesa ¤te" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" @@ -1618,26 +1654,25 @@ msgid "Archive" msgstr "Archiviu" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Trapienu di memoria di l'argumentu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" -msgstr "" -"Cum'è un unghjetta in a finestra di a lista d'aspettanza di trasferimentu" +msgstr "Cum'è un unghjetta in a finestra di a lista d'attesa di trasferimentu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../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 "Dumandà l'azzione" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/engine/server.cpp:856 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Dumandà a parolla d'intrata" @@ -1649,7 +1684,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Dumandà l'indirizzu IP esternu à u vostru sistemu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Fate e vostre dumande nantu à i forum FileZilla" @@ -1657,7 +1692,7 @@ msgid "Associated program not found:" msgstr "Prugrammu assuciatu micca trovu :" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" msgstr "Almenu, una cundizione di filtru ùn hè micca cumpleta" @@ -1669,7 +1704,7 @@ msgid "Attribute" msgstr "Attributu" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Autenticazione fiasca." @@ -1677,7 +1712,7 @@ msgid "Author:" msgstr "Autore :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Automaticu" @@ -1689,20 +1724,20 @@ msgid "Available sizes" msgstr "Dimensione dispunibule" -#: ../../locales/../src/engine/sizeformatting_base.cpp:160 -#: ../../locales/../src/engine/sizeformatting_base.cpp:219 +#: ../../locales/../src/engine/sizeformatting_base.cpp:154 +#: ../../locales/../src/engine/sizeformatting_base.cpp:213 msgid "B " msgstr "O " -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 msgid "B&ypass proxy" msgstr "Sfrancassi da u prox&y" -#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Discrittore gattive di u schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Instruzzioni d'utilizazione di basa" @@ -1710,16 +1745,16 @@ msgid "Behaviour" msgstr "Andamentu" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1158 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "In corsu di mudificazione" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Fate casu ! U certificatu hè statu revocatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Binariu" @@ -1727,20 +1762,24 @@ msgid "Blackboard" msgstr "Tavula nera" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 msgid "Bookmark" msgstr "Indetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Indetta :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Indette" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Sfuglià..." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Data di custruzzione :" @@ -1749,7 +1788,7 @@ msgid "Build information" msgstr "Infurmazione di custruzzione" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Categuria di faccenda :" @@ -1767,12 +1806,12 @@ msgid "C&ancel current operation" msgstr "&Abbandunà l'operazione currente" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" -msgstr "Sguassà tuttu" +msgstr "Squassà tuttu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "Cupià URL(s) nantu à u clipb&oard" @@ -1784,22 +1823,26 @@ msgid "C&ustom filetype associations:" msgstr "Associ persunalizati da tipu di schedariu :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1605 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "Funzioni CPU :" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Calculu di a sfarenza di u fusu orariu di u servu..." -#: ../../locales/../src/engine/transfersocket.cpp:639 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Ùn pò leghje u schedariu" -#: ../../locales/../src/engine/transfersocket.cpp:619 -#: ../../locales/../src/engine/transfersocket.cpp:685 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:716 msgid "Can't write data to file." msgstr "Ùn pò scrive nantu à u schedariu." -#: ../../locales/../src/engine/transfersocket.cpp:621 -#: ../../locales/../src/engine/transfersocket.cpp:687 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:718 #, c-format msgid "Can't write data to file: %s" msgstr "Ùn pò scrive nantu à u schedariu : %s" @@ -1807,23 +1850,24 @@ #: ../../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: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 "Abbandunà" @@ -1835,22 +1879,22 @@ msgid "Cancels the current operation" msgstr "L'operazione in corsu hè abbandunata" -#: ../../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 "" "Ùn hè micca pussibule d'accede à '%s', alcunu media framettu o lettore micca " "prontu." -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:561 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:1091 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Ùn pò micca impiegà l'indirizzu riquiestu" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:349 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1858,7 +1902,7 @@ "Ùn hè micca pussibule di chjode l'unghjetta quandu ella hè impiegata.\n" "Vulete abbandunà l'azzione in corsu è chjode l'unghjetta quantunque ?" -#: ../../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" @@ -1866,32 +1910,26 @@ "Ùn hè micca pussibule di paragunà i cartulari, chì ci sò sfarenti filtri " "attivi per i cartulari lucali è alluntanati" -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "" -"Ùn hè micca pussibule di paragunà i cartulari, chì ùn c'hè alcuna " -"cunnessione à un servu." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Ùn pò micca creà un novu 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:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1705 +#: ../../locales/../src/interface/search.cpp:696 msgid "Cannot edit file" msgstr "Ùn pò micca mudificà u schedariu" -#: ../../locales/../src/interface/LocalListView.cpp:1594 +#: ../../locales/../src/interface/LocalListView.cpp:1587 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:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Ùn pò micca mudificà u schedariu, passeghju alluntanatu scunnisciutu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:324 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1906,54 +1944,54 @@ "Ùn hè micca pussibule di caricà a barra d'attrezzi di Cunnessione Pronta da " "u schedariu di risorse" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 -msgid "Cannot load keyfile" -msgstr "Ùn hè micca pussibule di caricà u schedariu di chjave" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Ùn pò micca caricà u schedariu di chjave" -#: ../../locales/../src/interface/Mainfrm.cpp:1032 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "" "Ùn hè micca pussibule di caricà a barra d'attrezzi da u schedariu di risorse" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Ùn hè micca pussibule d'arricurdassi di a parolla d'intrata" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Cannot rename entry" msgstr "Ùn pò micca rinumà l'elementu" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Ùn pò micca rinumà u schedariu" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../../locales/../src/engine/proxy.cpp:172 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:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Ùn pò micca arregistrà u gruppu di filtri" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Ùn pò micca selezziunà u filtru" -#: ../../locales/../src/interface/edithandler.cpp:1506 -#: ../../locales/../src/interface/edithandler.cpp:1510 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Ùn hè micca pussibule di definisce l'associu di schedariu" -#: ../../locales/../src/interface/edithandler.cpp:1089 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Ùn pò micca fà vede u dialogu" -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Ùn pò micca leghje o mudificà u schedariu selezziunatu" @@ -1973,11 +2011,11 @@ msgid "Case sensitive (default)" msgstr "Sfarenzià maiuscule è minuscule (predefinitu)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" -msgstr "Categurie" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "Categurie à viutà" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "U certificatu è i dati di a sessione ùn sò micca dispunibule avà." @@ -1998,7 +2036,7 @@ msgstr "Cambià l'attributi di u schedariu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Cambià i diritti d'accessu à u schedariu." @@ -2008,11 +2046,11 @@ "Cambià e preferenze di u ghjurnale di i messaghji richiede u rilanciu di " "FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:649 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Prublema di cudificazione di caratteru" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Gruppu di caratteri" @@ -2052,7 +2090,7 @@ "Verificate l'infurmazione d'identificazione. U nome d'utilizatore principia " "o si compie da unu spaziu." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Cuntrollu di l'indirizzu IP esternu chì hè currettu" @@ -2060,27 +2098,31 @@ msgid "Checking for updates..." msgstr "Circhendu e messe à ghjornu..." -#: ../../locales/../src/interface/updater.cpp:779 +#: ../../locales/../src/interface/updater.cpp:716 #, 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:775 +#: ../../locales/../src/interface/updater.cpp:712 #, 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:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +msgid "Choose a key file" +msgstr "Sceglie un schedariu di chjave" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 msgid "Choose the default local directory" msgstr "Sciglite u cartulare lucale predefinitu" -#: ../../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:124 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "Sciglite u cartulare lucale" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Ingutuppu di dati interrottu scurrettamente" @@ -2089,7 +2131,7 @@ msgstr "Cudificazione :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "Chjode l'&unghjetta" @@ -2097,62 +2139,46 @@ msgid "Classic" msgstr "Classicu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "&Sguassà tutti l'elementi di u Ghjestiunariu di Siti" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" -msgstr "Sguassà &l'infurmazione d'accunciamentu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "Sguassà a storia di Cunnessione Pronta" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "Sguassà l'infurmazione per &ricunnettassi" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Sguassà a lista d'aspettanza di trasferimentu" +msgstr "Squassà &l'infurmazione d'accunciamentu" -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Clear history" -msgstr "Sguassà u storicu" +msgstr "Squassà u storicu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 +#: ../../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 "Sguassà i dati persunali" +msgstr "Squassà i dati persunali" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:149 msgid "Clear quickconnect bar" -msgstr "Sguassà a barra Cunnessione Pronta" +msgstr "Squassà a barra Cunnessione Pronta" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Sciglite Piantà per arregistrà a vostra cunfigurazione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "MAC per a cunnessione cliente à servu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "Cudificazione per a cunnessione cliente à servu :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" msgstr "Chjode tutte l'&altre unghjette" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Chjode FileZilla" @@ -2164,15 +2190,15 @@ msgid "Closes current tab" msgstr "Chjode l'unghjetta currente" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Cu&mmentarii :" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "Column properties" msgstr "Pruprietà di a culonna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Ozzione di a culonna" @@ -2180,46 +2206,46 @@ msgid "Command and its arguments should be properly quoted." msgstr "A cummanda è i so parametri devenu esse scritti currettamente." -#: ../../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:223 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Command failed" msgstr "Cummanda fiasca" -#: ../../locales/../src/engine/proxy.cpp:485 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Cummanda micca suppurtata" -#: ../../locales/../src/engine/engineprivate.cpp:209 +#: ../../locales/../src/engine/engineprivate.cpp:212 msgid "Command not supported by this protocol" msgstr "A cummanda ùn hè micca suppurtata da stu protocollu" -#: ../../locales/../src/engine/logging.cpp:111 -#: ../../locales/../src/interface/StatusView.cpp:276 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/engine/logging.cpp:112 +#: ../../locales/../src/interface/StatusView.cpp:283 +#: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" msgstr "Cummanda :" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Cummentariu" -#: ../../locales/../src/interface/verifycertdialog.cpp:214 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Nome cumunu :" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 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:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 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:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Paragunà a dimensione di u &schedariu" @@ -2255,8 +2281,8 @@ msgid "Concurrent transfers" msgstr "Trasferimenti simultanei" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "I &cundizioni facenu a distinzione trà maiuscule è minuscule" @@ -2272,31 +2298,36 @@ msgid "Configure port range" msgstr "Cunfigurà a stesa di i porti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Cunfigurazione di FileZilla è di a vostra reta" -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" -msgstr "Cunfirmà a sguassatura" +msgstr "Cunfirmà a squassatura" -#: ../../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: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 "Cunfirmazione necessaria" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Bravu, a vostra cunfigurazione pare funziunà." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:148 msgid "Connect bypassing proxy settings" msgstr "Cunnettà senza fà casu à e preferenze di u proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "A richiesta à u proxy hè fiasca : %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Cunnettassi in l'unghjetta currente" @@ -2309,28 +2340,29 @@ msgid "Connect to specified Site Manager site" msgstr "Cunnettà à u situ specificatu in u Ghjestiunariu di Siti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:910 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "Cunnettu" -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Cunnessione in corsu" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Cunnessione in corsu à %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Cunnessione in corsu à %s via u proxy" +msgid "Connecting to %s through %s proxy" +msgstr "Cunnessione in corsu à %s via u proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:956 -#: ../../locales/../src/engine/proxy.cpp:226 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../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 "Cunnessione in corsu à %s..." @@ -2339,179 +2371,189 @@ msgid "Connection" msgstr "Cunnessione" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Cunnessione interrotta" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "A prova di cunnessione hè fiasca" -#: ../../locales/../src/engine/ControlSocket.cpp:921 -#: ../../locales/../src/engine/proxy.cpp:200 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "A prova di cunnessione hè fiasca cù \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:181 -#: ../../locales/../src/engine/engineprivate.cpp:677 +#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "A prova di cunnessione hè statu interrotta da l'utilizatore" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "A prova di cunnessione hà messu un tempu troppu longu" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Cunnessione chjosa" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Cunnessione chjosa da u servu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:368 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Cunnessione stabilita, lanciu di TLS in corsu..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Cunnessione stabilita, mandà d'una dumanda HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:396 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Cunnessione stabilita, in attesa di u messaghju di benvenuta..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." -msgstr "Cunnessione stabilita, in aspettanza di u messaghju di benvenuta..." +msgstr "Cunnessione stabilita, in attesa di u messaghju di benvenuta..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Cunnessione persa" -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Cunnessione ricusata per via da e regule" -#: ../../locales/../src/engine/proxy.cpp:479 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Cunnessione ricusata" -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Cunnessione ricusata da u servu" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Cunnessione iniziata torna da a reta" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Cunnessione iniziata torna da unu paru" -#: ../../locales/../src/engine/ControlSocket.cpp:558 +#: ../../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] "Cunnessione abandunnata dopu à %d seconda d'inattività" msgstr[1] "Cunnessione abandunnata dopu à %d seconde d'inattività" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "A cunnessione hè fiasca, tempu troppu longu." -#: ../../locales/../src/interface/search.cpp:358 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "A cunnessione cù u servu hè persa." -#: ../../locales/../src/engine/proxy.cpp:209 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." -msgstr "Cunnessione stabilita cù u proxy, in aspettanza di u toccamanu..." +msgstr "Cunnessione stabilita cù u proxy, in attesa di u toccamanu..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "A cunnessione cù u servu hè statu chjosa anticipatamente." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "A cunnessione cù u servu di prova hè fiasca." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:276 -msgid "Convert keyfile" -msgstr "Cunvertisce u schedariu di chjave" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" +msgstr "Convertisce un schedariu di chjave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:642 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 #, c-format msgid "Copy (%d) of %s" msgstr "Cupià (%d) di %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, c-format msgid "Copy of %s" msgstr "Cupià di %s" #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 msgid "Copy the URLs of the selected items to clipboard." msgstr "Cupià l'URLs di l'elementi selezziunati nantu à u clipboard." -#: ../../locales/../src/engine/transfersocket.cpp:170 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Ùn pò micca accettà a cunnessione : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 msgid "Could not add connection to Site Manager" msgstr "Ùn pò micca aghjunghje a cunnessione à u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/state.cpp:823 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Ùn hè micca pussibule di compie l'operazione" -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Ùn pò micca cunnettà à u servu" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Ùn pò micca cunnettà à u servu : %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "" "Ùn hè micca pussibule di convertì a cummanda secondu a cudificazione di u " "servu" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "Ùn hè micca pussibule di convertì a chjave privata" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not copy URLs" msgstr "Ùn pò micca cupià l'indirizzi URL" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Ùn pò micca cupià i dati" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Ùn pò micca creà u schedariu lucale %s\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:864 +#: ../../locales/../src/engine/logging.cpp:173 +#, 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 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 +2563,11 @@ "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:4175 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Ùn pò micca stabilisce a cunnessione cù u servu" -#: ../../locales/../src/interface/FileZilla.cpp:481 +#: ../../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 " @@ -2538,13 +2580,13 @@ "linea di cummanda '--datadir ' o affetendu a variabile " "d'ambiente FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "" "Ùn hè micca pussibule d'ingenereghjà una sequenza d'identificazione " "persunalizata." -#: ../../locales/../src/engine/tlssocket.cpp:937 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2552,7 +2594,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:914 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2560,28 +2602,33 @@ "Ùn hè micca pussibule di sapè u nome di sughjettu di u certificatu, " "gnutls_x509_get_dn hè fiascu" -#: ../../locales/../src/interface/state.cpp:976 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Ùn hè micca pussibule di sapè u nome sanu di u passeghju alluntanatu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:236 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:250 msgid "Could not get reply from fzputtygen." msgstr "Ùn hè micca pussibule di riceve una risposta di fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1609 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/search.cpp:696 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:860 +#: ../../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/engine/tlssocket.cpp:855 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, fuzzy, 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" @@ -2589,8 +2636,8 @@ "Ùn hè micca pussibule di creà a struttura di i certificati 'peer', " "gnutls_x509_crt_init hè fiascu" -#: ../../locales/../src/interface/import.cpp:98 -#: ../../locales/../src/interface/import.cpp:284 +#: ../../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 " @@ -2598,18 +2645,18 @@ "Any changes made in the Site Manager will not be saved." msgstr "" "Ùn hè micca pussibule di caricà \"%s\", assicuratevvi chì u schedariu hè " -"leghjittimu è pò esse accessu.\n" +"accettevule è pò esse accessu.\n" "I cambiamenti fatti in u Ghjestiunariu di Siti ùn seranu micca arregistrati." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:227 -msgid "Could not load keyfile" -msgstr "Ùn pò micca caricà u schedariu di chjave" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Ùn pare micca pussibule di caricà u schedariu di chjave" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:301 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Ùn hè micca pussibule di caricà a chjave privata" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2621,7 +2668,7 @@ "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare alluntanatu ?" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2632,7 +2679,7 @@ "cartulare alluntanatu '%s'.\n" "Avà, u sfugliendu sincrunizatu ùn hè più attivu." -#: ../../locales/../src/interface/state.cpp:292 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2643,20 +2690,20 @@ "cartulare lucale '%s'.\n" "U sfugliendu sincrunizatu ùn hè più attivu." -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not open clipboard" msgstr "Ùn pò micca apre a fermacarta" -#: ../../locales/../src/engine/logging.cpp:105 -#: ../../locales/../src/engine/logging.cpp:172 -#: ../../locales/../src/engine/logging.cpp:204 +#: ../../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 pò micca apre u ghjurnale di i messaghji : %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Ùn hè micca pussibule di determinà u nome di u passeghju alluntanatu." @@ -2664,43 +2711,53 @@ msgid "Could not parse server address:" msgstr "Ùn hè micca pussibule di determinà l'indirizzu di u servu :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Ùn pò micca leghje da socket : %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Ùn pò micca leghje da socket : %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Ùn pò micca leghje l'elementu di u servu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2654 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Ùn pò micca cunnettà à u servu" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 #, 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:2566 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Ùn hè micca pussibule d'andà à a fine di u schedariu" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Ùn pò micca mandà a cummanda à fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2682 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Ùn hè micca pussibule di creà un operazione d'Intrata/Esciuta" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Ùn hè micca pussibule di stabilisce u toccamanu cù u proxy : %s" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Ùn hè micca pussibule di principià u trasferimentu" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2709,64 +2766,63 @@ "Ù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:836 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 #, 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:324 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 #, 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:1859 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -"Ùn pò micca scrive \"%s\", a lista d'aspettanza ùn pò micca esse " -"arregistrata.\n" +"Ù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.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, 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:125 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "Ùn pò micca scrive \"%s\" :" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Ùn pò micca scrive in u schedariu di chjave : %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Ùn pò micca scrive in u schedariu lucale" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:230 +#: ../../locales/../src/engine/logging.cpp:297 #, 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:881 -#: ../../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 "Ùn pò micca scrive in socket : %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "Paese :" @@ -2774,17 +2830,25 @@ msgid "Crea&te new file" msgstr "Creà unu schedariu novu" +#: ../../locales/../src/interface/state.cpp:959 +msgid "Create &missing local directory and enter it" +msgstr "Creà u cartulare lucale chì &manca è andaci" + +#: ../../locales/../src/interface/state.cpp:886 +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:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../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 "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:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../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 "Creà unu sottu-cartulare novu in u cartulare currente è impiegallu" @@ -2794,52 +2858,52 @@ #: ../../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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Create director&y and enter it" msgstr "Creà unu cartulare è impiegallu" -#: ../../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:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteListView.cpp:1293 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Create directory" msgstr "Creà unu cartulare" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Creà unu schedariu viotu" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Creendu unu cartulare" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3234 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1955 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Creendu u cartulare '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Errore impurtantissimu" -#: ../../locales/../src/engine/ControlSocket.cpp:167 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Errore impurtantissimu :" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Errore impurtantissimu di trasferimentu di schedariu" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, 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:382 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2849,33 +2913,37 @@ "sincrunizazione (%s).\n" "Avà, u sfugliendu sincrunizatu ùn hè più attivu." -#: ../../locales/../src/interface/statusbar.cpp:391 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "Avà, u tipu di trasferimentu currente hè ASCII." -#: ../../locales/../src/interface/statusbar.cpp:399 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "Avà, u tipu di trasferimentu currente hè automaticu." -#: ../../locales/../src/interface/statusbar.cpp:395 +#: ../../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 +msgid "Curve:" +msgstr "Curva :" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "Persunaliza&tu" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Gruppu di filtri persunalizati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Servu persunalizatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Tipu di d&atu" @@ -2885,17 +2953,21 @@ "Prefissi d&ecimale cù simbuli di u Sistemu Internaziunale (SI) (p.i. 1 Ko = " "1000 ottetti)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "Pr&edefinitu" #: ../../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:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 msgid "D&elete" -msgstr "Sguassà" +msgstr "Squassà" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "&Paragone di cartulare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Disattivà tuttu" @@ -2907,8 +2979,8 @@ msgid "D&ouble-click action on directories:" msgstr "Azzione di u d&opiu-cliccu nantu à i cartulari :" -#: ../../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:2842 msgid "D&uplicate" msgstr "D&uplicà" @@ -2916,16 +2988,16 @@ msgid "DOS-like with virtual paths" msgstr "Accede à i passeghji virtuali à a manera di DOS" -#: ../../locales/../src/interface/edithandler.cpp:1661 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Tipu di schedariu periculosu" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Dati" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Socket di dati chjosu troppu tostu." @@ -2953,7 +3025,7 @@ msgid "Debugging settings" msgstr "Preferenze per Spannà" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Cartulare &lucale predefinitu :" @@ -2965,23 +3037,23 @@ msgid "Default editor not properly quoted." msgstr "Editore predefinitu micca specificatu currettamente." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../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 "Azzione predefinita à fà nantu à i schedarii chì esistenu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "Cartulare da &reta in là predefinitu :" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../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 "" "U passeghju alluntanatu predefinitu ùn pò micca esse determinatu. " -"Assicuratevvi ch'ellu hè un passeghju esplicitu leghjittimu è cunnisciutu da " +"Assicuratevvi ch'ellu hè un passeghju esplicitu accettevule è cunnisciutu da " "u tipu di servu selezziunatu." #: ../../locales/../src/interface/settings/optionspage_language.cpp:71 @@ -3008,7 +3080,7 @@ "U tempu trà e prove fiasche di cunnessione deve esse sceltu trà 1 è 999 " "seconde." -#: ../../locales/../src/engine/engineprivate.cpp:519 +#: ../../locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -3017,68 +3089,63 @@ "Delaying connection for %d seconds due to previously failed connection " "attempt..." msgstr[0] "" -"Tempu d'aspettanza di %d seconda per via d'una precedente prova di " -"cunnessione fiasca..." +"Tempu d'attesa di %d seconda per via d'una precedente prova di cunnessione " +"fiasca..." msgstr[1] "" -"Tempu d'aspettanza di %d seconde per via d'una precedente prova di " -"cunnessione fiasca..." +"Tempu d'attesa di %d seconde per via d'una precedente prova di cunnessione " +"fiasca..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" -msgstr "Sguassà l'elementu di u Ghjestiunariu di Siti" +msgstr "Squassà l'elementu di u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" -msgstr "Sguassà u cartulare selezziunatu" +msgstr "Squassà u cartulare selezziunatu" #: ../../locales/../src/interface/resources/xrc/menus.xrc:277 #: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" -msgstr "Sguassà i schedarii è i cartulari selezziunati" +msgstr "Squassà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:365 #, c-format msgid "Deleting \"%s\"" -msgstr "Sguassatura di \"%s\"" +msgstr "Squassatura di \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:367 +#: ../../locales/../src/engine/engineprivate.cpp:368 #, c-format msgid "Deleting %u files from \"%s\"" -msgstr "Sguassatura di %u schedarii in \"%s\"" - -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting directories" -msgstr "Sguassatura di i cartulari" - -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"A sguassatura di pareghji cartulari senza relazione trà elli ùn hè micca " -"pussibule avà" +msgstr "Squassatura di %u schedarii in \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" -msgstr "Sguassatura di a leia simbulica" +msgstr "Squassatura di a leia simbulica" -#: ../../locales/../src/interface/LocalTreeView.cpp:983 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Scagnu" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Ditaglii" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Ditaglii per una nova chjave :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +msgid "Detected newer version of FileZilla" +msgstr "Versione più nova di FileZilla identificata" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "&Cartulari" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Direzzione" @@ -3086,17 +3153,17 @@ msgid "Directory" msgstr "Cartulare" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../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:464 -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Paragone di cartulare" -#: ../../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 "U paragone di cartulare hè fiascu" @@ -3104,41 +3171,41 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" "U cartulare cuntenendu u ghjurnale di i messaghji ùn esiste micca, o u nome " -"di schedariu ùn hè micca leghjittimu." +"di schedariu ùn hè micca accettevule." -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:191 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:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Fiascu per mostrà a lista di u cartulare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Filtri per a lista di u cartulare" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Lista di u cartulare \"%s\" riesciuta" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Lista di u cartulare riesciuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "Disattivà tuttu" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:952 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:673 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3150,23 +3217,23 @@ msgid "Disconnect from server" msgstr "Disghjunghje da u servu" -#: ../../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: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 "Disghjuntu da u servu" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ControlSocket.cpp:1020 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "Disghjuntu da u servu : %s" -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Disghjunzione in corsu da u servu precedente" @@ -3187,15 +3254,15 @@ msgid "Do ¬hing" msgstr "Ùn fà &nunda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../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 "" "Fate listessa cù &tutti i schedarii selezziunati chì sò dighjà in corsu di " "mudificazione" -#: ../../locales/../src/interface/Mainfrm.cpp:1176 -#: ../../locales/../src/interface/Mainfrm.cpp:1198 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Site sicuru di chjode FileZilla ?" @@ -3203,31 +3270,31 @@ msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" msgstr "" -"Site sicuru di sguassà tutti l'elementi di u Ghjestiunariu di Siti è a lista " -"d'aspettanza di trasferimenti ?" +"Site sicuru di squassà tutti l'elementi di u Ghjestiunariu di Siti è a lista " +"d'attesa di trasferimenti ?" #: ../../locales/../src/interface/clearprivatedata.cpp:46 msgid "Do you really want to delete all Site Manager entries?" -msgstr "Site sicuru di sguassà tutti l'elementi di u Ghjestiunariu di Siti ?" +msgstr "Site sicuru di squassà tutti l'elementi di u Ghjestiunariu di Siti ?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" -msgstr "Site sicuru di sguassà l'elementu selezziunatu ?" +msgstr "Site sicuru di squassà l'elementu selezziunatu ?" #: ../../locales/../src/interface/clearprivatedata.cpp:40 msgid "Do you really want to delete the transfer queue?" -msgstr "Site sicuru di sguassà a lista d'aspettanza di trasferimenti ?" +msgstr "Site sicuru di squassà a lista d'attesa di trasferimenti ?" -#: ../../locales/../src/interface/Mainfrm.cpp:612 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, 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:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 msgid "Do you want to reopen this file?" msgstr "Vulete apre stu schedariu torna ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Documentazione" @@ -3243,31 +3310,31 @@ msgid "Double-click action" msgstr "Azzione di u dopiu-cliccu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Telecaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limitazione di telecaricamentu :" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Limitazione di telecaricamentu : %s/s" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Limitazione di telecaricamentu : alcuna" -#: ../../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:3110 +#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:529 msgid "Download search results" msgstr "Telecaricà i risultati di a ricerca" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Telecaricà u cartulare selezziunatu" @@ -3275,7 +3342,7 @@ msgid "Download selected files and directories" msgstr "Telecaricà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3284,45 +3351,35 @@ "Velocità di telecaricamentu : %s/s\n" "Velocità d'incaricamentu : %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "Telecarichendu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Telecarichendu %s" -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Telecaricà parechji cartulari senza relazione trà elli ùn hè micca pussibule " -"avà" - -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading search results" -msgstr "Telecarichendu i risultati di a ricerca" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Telecarichendu a messa à ghjornu..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../locales/../src/interface/QueueView.cpp:87 +#: ../../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:87 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 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:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 +#: ../../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:93 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Sguillà & Depone trà parechji servi ùn hè micca pussibule avà." @@ -3330,7 +3387,7 @@ msgid "Dupl&icate" msgstr "Dupl&icà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "Attivà tuttu" @@ -3347,15 +3404,21 @@ msgid "E&xit" msgstr "E&sce" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../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 "Es&purtà..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "E-Mail:" msgstr "Indirizzu Elettronicu :" -#: ../../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 "Ogni filtru hà bisognu d'almenu una cundizione." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "Mudificà i filtri" @@ -3365,16 +3428,16 @@ msgstr "" "Mudificà u schedariu cù l'editore è incaricà i cambiamenti nantu à u servu." -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "A mudificazione di i cartulari ùn hè micca suppurtata" -#: ../../locales/../src/interface/LocalListView.cpp:1594 -#: ../../locales/../src/interface/LocalListView.cpp:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Editing failed" msgstr "Mudificazione fiasca" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Mudificazione di i risultati di a ricerca" @@ -3382,7 +3445,7 @@ msgid "Email:" msgstr "Messaghju elettronicu :" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Cummanda viota" @@ -3390,7 +3453,7 @@ msgid "Empty command." msgstr "Cummanda viota." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Lista di cartulari viota" @@ -3398,6 +3461,11 @@ 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." @@ -3416,27 +3484,27 @@ msgid "Empty quoted string." msgstr "A frasa framezu à e virgulette hè viota." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "&Attivà tuttu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" -msgstr "Attivà u filtru di i caratteri micca leghjittimi" +msgstr "Attivà u filtru di i caratteri micca accettevule" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 msgid "Encrypted" msgstr "Cifratu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Cifratura" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Ditaglii di a cifratura" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Compie u paragone è cambià l'urdine di a scelta ?" @@ -3444,15 +3512,15 @@ msgid "Enter &custom command..." msgstr "Scrivite una &cummanda persunalizata..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Scrivite 0 per una velocità senza limitu." -#: ../../locales/../src/interface/QueueView.cpp:2133 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Scrivite una cummanda" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Scrivite una cummanda persunalizata" @@ -3466,11 +3534,11 @@ msgid "Enter filter name" msgstr "Scrivite u nome di u filtru" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Scrivite u nome di u gruppu di filtri" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Scrivite u novu nome di u gruppu di filtri" @@ -3511,15 +3579,14 @@ "- ftps:// per FTP nantu à TLS (sottintesu)\n" "- ftpes:// per FTP nantu à TLS (esplicitu)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../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 "" "Scrivite a parolla d'intrata per u schedariu '%s'.\n" -" Sapete chì u schedariu cunvertittu ùn serà micca prutettu cù una parolla " -"d'intrata." +"U schedariu cunvertittu serà prutettu cù a listessa parolla d'intrata." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3529,7 +3596,7 @@ "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:61 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Scrivite u nome d'utilizatore è a parolla d'intrata" @@ -3538,63 +3605,63 @@ msgstr "Errore mentre l'espurtazione di e preferenze" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Errore mentre l'impurtazione" -#: ../../locales/../src/interface/QueueView.cpp:1926 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" -msgstr "Errore mentre u caricamentu di a lista d'aspettanza" +msgstr "Errore mentre u caricamentu di a lista d'attesa" -#: ../../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/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:972 -#: ../../locales/../src/interface/import.cpp:99 -#: ../../locales/../src/interface/import.cpp:285 +#: ../../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:1842 -#: ../../locales/../src/interface/search.cpp:798 -#: ../../locales/../src/interface/search.cpp:817 +#: ../../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: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/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 "Errore mentre u caricamentu di u schedariu xml" -#: ../../locales/../src/interface/QueueView.cpp:1831 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" -msgstr "Errore mentre l'arregistramentu di a lista d'aspettanza" +msgstr "Errore mentre l'arregistramentu di a lista d'attesa" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../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" -#: ../../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/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.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/sitemanager_dialog.cpp:830 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 +#: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Errore mentre a scrittura di u schedariu xml" -#: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:274 -#: ../../locales/../src/interface/StatusView.cpp:328 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:281 +#: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" msgstr "Errore :" @@ -3620,19 +3687,19 @@ msgid "Explorer" msgstr "Espluratore" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" -msgstr "Espurtà a lista d'aspettanza" +msgstr "Espurtà a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "E&spurtà e preferenze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Espurtazione di e preferenze" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "Nome d&i u filtru :" @@ -3640,7 +3707,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocollu di Trasferimentu di Schedariu" @@ -3653,7 +3720,7 @@ msgstr "FTP - Protocollu di Trasferimentu di Schedariu senzà sicurità" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "Mutore FTP micca dimaratu, ùn si pò micca cunnettà" @@ -3686,143 +3753,149 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP cù cunnessione TLS sottintesa" -#: ../../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/LocalTreeView.cpp:871 -#: ../../locales/../src/interface/LocalTreeView.cpp:1124 -#: ../../locales/../src/interface/viewheader.cpp:507 +#: ../../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 "U cambiamentu di cartulare hè fiascu" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../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 "U cambiamentu di lingua hè fiascu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Fiascu di a copiatura o a mossa di i siti" -#: ../../locales/../src/interface/xmlfunctions.cpp:466 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 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:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Fiascu di a creazione di socket d'ascoltu, abbandonu in corsu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4154 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:629 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Fiascu per truvà u passeghju di 'My Documents'" -#: ../../locales/../src/interface/LocalTreeView.cpp:617 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Fiascu per truvà u passeghju di u scagnu 'desktop'" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:82 +#: ../../locales/../src/interface/context_control.cpp:80 msgid "Failed to initialize FTP engine" msgstr "Fiascu per dimarrà u mutore FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:376 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 #: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Fiascu per dimarrà TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Fiascu per dimarrà u mutore FTP" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" -"Ùn pò micca caricà l'interfaccia, i schedarii di risorse sonu leghjittimi ?" +"Ùn pò micca caricà l'interfaccia, podasse i schedarii di risorse ùn sò " +"accettevule ?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Impussibule di caricà a chjave privata : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Impussibule di apre \"%s\" per aghjuntu o scrittura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2622 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Fiascu per apre \"%s\" per leghjelu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2588 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Fiascu per apre \"%s\" per scrivelu" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Fiascu per determinà u passeghju riturnatu." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Fiascu per riceve i dati" -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Fiascu per ritruvà a lista di u cartulare" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Fiascu per ritruvà l'indirizzu IP esternu, abbandonu in corsu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3865 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 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:3886 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Fiascu per ritruvà l'indirizzu IP lucale." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Fiascu per ritruvà l'indirizzu IP lucale, abbandonu in corsu" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Fiascu per ritruvà l'indirizzu IP esternu." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Fiascu per mandà a cummanda." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:173 #, 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" -#: ../../locales/../src/interface/FileZilla.cpp:192 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3830,14 +3903,14 @@ "Fiascu per sceglie %s (%s) cum'è lingua, impiegu di a lingua predefinita di " "u sistemu (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, 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." -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../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" @@ -3845,14 +3918,14 @@ "Fiascu per sceglie %s, cum'è lingua, impiegu di a lingua predefinita di u " "sistemu" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:147 #, 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)." -#: ../../locales/../src/interface/FileZilla.cpp:178 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" @@ -3863,16 +3936,16 @@ msgid "Failed to validate settings" msgstr "Ùn hè micca pussibule di validà e preferenze" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Ùn hè micca pussibule di verificà u certificatu paru" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Fiascu per scrive nantu à u schedariu %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:483 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "Fiascu per scrive nantu à u schedariu xml" @@ -3884,11 +3957,11 @@ msgid "Fall back to active mode" msgstr "Ritornu à u modu attivu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Sch&edariu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Sch&edarii" @@ -3900,11 +3973,11 @@ msgid "File Types" msgstr "Tipi di schedariu" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Descrittore di schedariu ùn hè micca socket" -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "U schedariu ùn cuntene micca di datu à impurtà." @@ -3912,7 +3985,7 @@ msgid "File editing" msgstr "Mudificazione di u schedariu" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "U schedariu esiste" @@ -3920,7 +3993,7 @@ msgid "File exists action" msgstr "Azzione à fà quandu u schedariu esiste" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "U schedariu hà cambiatu" @@ -3928,9 +4001,9 @@ msgid "File lists" msgstr "Liste di schedarii" -#: ../../locales/../src/interface/edithandler.cpp:1585 -#: ../../locales/../src/interface/FileZilla.cpp:671 -#: ../../locales/../src/interface/FileZilla.cpp:756 +#: ../../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 "U schedariu ùn esiste micca" @@ -3939,54 +4012,54 @@ msgid "File search" msgstr "Ricerca di schedariu" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "U trasferimentu di u schedariu hè abbandunatu da l'utilizatore" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, 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:133 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "U trasferimentu di schedariu hè fiascu" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:128 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "U trasferimentu di schedariu hè saltatu" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "U trasferimentu di schedariu hè compiu bè" -#: ../../locales/../src/engine/ControlSocket.cpp:111 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1175 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "I trasferimenti di schedariu sò sempre in corsu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 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:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 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:482 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "Errore di FileZilla" @@ -3998,11 +4071,11 @@ "Avà, FileZilla pò verificà a vostra cunfigurazione per assicurassi chì tuttu " "và bè." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "FileZilla hè dighjà cunnettu à un servu." -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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 " @@ -4016,12 +4089,12 @@ msgid "Filelist status &bars" msgstr "Barre di &statu di l'arburiscenze" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../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:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../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 "Nome di schedariu" @@ -4029,46 +4102,46 @@ msgid "Filename &filters..." msgstr "&Filtri di u nome di schedariu..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3038 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2216 +#: ../../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 "" "U nome di u schedariu ùn pò micca esse custruitu per u cartulare %s è u " "schedariu %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" -msgstr "Nome di schedariu micca leghjittimu" +msgstr "Nome di schedariu micca accettevule" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "U nome di schedariu ùn hà micca cambiatu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Nome di schedariu :" -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:318 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:292 +#: ../../locales/../src/interface/file_utils.cpp:293 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:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 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:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/LocalListView.cpp:277 +#: ../../locales/../src/interface/RemoteListView.cpp:374 +#: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" msgstr "Dimensione di schedariu" @@ -4076,9 +4149,9 @@ msgid "Filesize format" msgstr "Forma di a dimensione di schedariu" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:278 +#: ../../locales/../src/interface/RemoteListView.cpp:375 +#: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" msgstr "Tipu di schedariu" @@ -4087,35 +4160,35 @@ msgid "Filetype associations" msgstr "Associ da tipu di schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "U filtru hè applicatu à :" #: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" -msgstr "Filtratura di i caratteri micca leghjittimi in i nomi di schedarii" +msgstr "Filtratura di i caratteri micca accettevule in i nomi di schedarii" #: ../../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 "U nome di filtru esiste dighjà" -#: ../../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 "Filtrà l'elementi chì currispondenu à tutte ste cundizione" -#: ../../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 "Filtrà l'elementi chì currispondenu à almenu una di ste cundizione" -#: ../../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 "Filtrà l'elementi chì ùn currispondenu à alcuna di ste cundizione" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "U gruppu di filtru esiste dighjà" @@ -4123,17 +4196,17 @@ msgid "Filter the directory listings" msgstr "Filtrà u cuntenutu di u cartulare" -#: ../../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 "A validazione di u filtru hè fiasca" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Circà i &schedarii" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Circà i &cartulari" @@ -4145,12 +4218,12 @@ msgid "Fingerprint (SHA-256):" msgstr "Impronta (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 "Impronta :" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Assistente di cunfigurazione di parafocu è 'router'" @@ -4174,7 +4247,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:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "Forzà a cudificazione &UTF-8" @@ -4182,7 +4255,7 @@ msgid "Force showing &hidden files" msgstr "Forzà l'affissu di i schedarii &piattati" -#: ../../locales/../src/interface/Mainfrm.cpp:668 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Forzà l'affissu di i schedarii piattati" @@ -4197,12 +4270,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:710 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Rinnovu trovu %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Più di documentazione" @@ -4210,7 +4283,7 @@ msgid "General" msgstr "Generale" -#: ../../locales/../src/engine/proxy.cpp:467 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Fiascu generale di u servu SOCKS" @@ -4223,35 +4296,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:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Aiutu in linea (inglese)" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 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:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Indette glubale" -#: ../../locales/../src/engine/tlssocket.cpp:185 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Errore GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:187 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Errore GnuTLS %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:181 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Errore GnuTLS %d in %s : %s" -#: ../../locales/../src/engine/tlssocket.cpp:179 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Errore GnuTLS %d : %s" @@ -4272,7 +4345,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP nantu à TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Hash :" @@ -4281,22 +4354,22 @@ msgstr "Piattatu" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Altu" -#: ../../locales/../src/interface/queue.cpp:887 -#: ../../locales/../src/interface/queue.cpp:974 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "U più altu" -#: ../../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 "" "U numeru u più maiò di u portu dispunibule deve esse sceltu trà 1024 è 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 "" @@ -4307,11 +4380,15 @@ msgid "Homepage:" msgstr "Prima pagina di u situ FileZilla :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Host is down" +msgstr "L'ospite ùn funziona più" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" msgstr "Impronta di a chjave di l'ospite :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "A chjave di l'ospite ùn currisponde micca" @@ -4319,18 +4396,18 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "L'ospite principia cù '[' ma manca quella di diritta." -#: ../../locales/../src/engine/proxy.cpp:476 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Ospite inaccessibile" #: ../../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 "Ospite :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "Ore," @@ -4338,7 +4415,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esempiu : 15:47)" -#: ../../locales/../src/engine/proxy.cpp:124 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "L'indirizzi IPv6 ùn sò micca suppurtati cù un proxy SOCKS4" @@ -4378,7 +4455,7 @@ "S'è l'ozzione di ritornu hè attiva, vi serete capace di cunnettavvi à i " "servi mal cunfigurati chì ricusanu u modu di trasferimentu selezziunatu." -#: ../../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." @@ -4386,7 +4463,7 @@ "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:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4394,7 +4471,7 @@ "S'è u prublemu ùn smarisce micca, vole si dì chì u 'router' è/o u parafocu " "blocca sempre FieZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4412,15 +4489,15 @@ "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:3186 +#: ../../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 "" "S'è a leia simbolica (symlink) assuciassi à unu cartulare, FileZilla pò sia " -"sguassà sta leia, sia scaccià u cuntenutu di u cartulare ligatu." +"squassà sta leia, sia scaccià u cuntenutu di u cartulare ligatu." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4428,13 +4505,13 @@ "S'è stu prublemu ùn smarisce micca, ci vole à chere una soluzione à u " "custruttore di u 'router' è/o u parafocu." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "S'è stu prublemu ùn smarisce micca, ci vole à chjamà u custruttore di u " "'router'." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1441 +#: ../../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 " @@ -4466,7 +4543,7 @@ "S'è voi cliccate nantu à test, FileZilla pruverà di andà nantu à probe." "filezilla-project.org è ferà qualchì prova simplice." -#: ../../locales/../src/interface/Mainfrm.cpp:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "S'è voi chjudate FileZilla, i vostri cambiamenti seranu persi." @@ -4491,7 +4568,7 @@ "S'elli ci sò prublemi per raccoglie liste di cuntenutu di cartulari o per " "trasferà schedarii, pruvate di cambià u modu di trasferimentu predefinitu." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4526,7 +4603,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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4534,16 +4611,16 @@ "S'è u vostru 'router' cuntinua à cambià l'indirizzu IP, ci vole à chjamà u " "custruttore di u 'router'." -#: ../../locales/../src/interface/import.cpp:80 +#: ../../locales/../src/interface/import.cpp:87 msgid "Import data from older version" msgstr "Impurtà i dati da una vechja versione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Impurtà e preferenze" -#: ../../locales/../src/interface/import.cpp:66 -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:76 msgid "Import successful" msgstr "Impurtazione riesciuta" @@ -4587,7 +4664,7 @@ "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:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4595,7 +4672,7 @@ "Catena micca cumpleta, u certificatu principale ùn hè micca un certificatu " "auto-firmatu da un auturità qualificata" -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "A parolla d'intrata hè falsa" @@ -4611,13 +4688,17 @@ msgid "Initializing TLS..." msgstr "Lanciu di TLS in corsu..." +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Cudificazione micca sicura !" + #: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servu senza sicurità chì ùn supporta micca FTP cù 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:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interrattivu" @@ -4625,76 +4706,77 @@ msgid "Interface" msgstr "Interfaccia" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Interrottu da u signale" -#: ../../locales/../src/engine/ControlSocket.cpp:216 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Interrottu da l'utilizatore" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" -msgstr "Lunghezza di u cuntenutu ùn hè micca leghjittima" +msgstr "Lunghezza di u cuntenutu ùn hè micca accettevule" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" -msgstr "Risposta HTTP micca leghjittima" +msgstr "Risposta HTTP micca accettevule" -#: ../../locales/../src/engine/socket.cpp:1030 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" -msgstr "Parametru passatu micca leghjittimu" +msgstr "Parametru passatu micca accettevule" -#: ../../locales/../src/engine/ControlSocket.cpp:454 -#: ../../locales/../src/engine/ControlSocket.cpp:510 +#: ../../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 "" -"A sequenza di caratteri ricevuti ùn hè micca leghjittima, UTF-8 hè " +"A sequenza di caratteri ricevuti ùn hè micca accettevule, UTF-8 hè " "disattivatu. Selezziunate UTF-8 in u Ghjestiunariu di Siti per forzà " "l'impiegu d'UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" -msgstr "Dimensione di l'ingutuppu micca leghjittima" +msgstr "Dimensione di l'ingutuppu micca accettevule" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Dati ricevuti micca leghjittimi" +msgstr "Dati ricevuti micca accettevule" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 -#: ../../locales/../src/interface/verifycertdialog.cpp:52 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" -msgstr "Data micca leghjittima" +msgstr "Data micca accettevule" -#: ../../locales/../src/interface/file_utils.cpp:292 -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Invalid filename" -msgstr "Nome di schedariu micca leghjittimu" +msgstr "Nome di schedariu micca accettevule" #: ../../locales/../src/engine/server.cpp:162 msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "" -"Ospite micca leghjittimu, dopu à a parentesi quadra di fine, solu i dui " +"Ospite micca accettevule, dopu à a parentesi quadra di fine, solu i dui " "punti è u portu ponu esse indicati." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" -msgstr "Intrata micca leghjittima" +msgstr "Intrata micca accettevule" #: ../../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 "" -"U numeru di portu ùn hè micca leghjittimu. Deve esse sceltu trà 1 è 65535." +"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:122 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4702,72 +4784,72 @@ "ftps:// for FTP over TLS (implicit) and\n" "ftpes:// for FTP over TLS (explicit)." msgstr "" -"U protocollu indicatu ùn hè micca leghjittimu. I protocolli suppurtati sò :\n" +"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)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -"Ospite di proxy micca leghjittimu, dopu à a parentesi quadra di fine, solu i " +"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:377 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." -msgstr "Espressione regulare micca leghjittima in i cundizioni di ricerca." +msgstr "Espressione regulare micca accettevule in i cundizioni di ricerca." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:597 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" -msgstr "Codice di risposta micca leghjittimu" +msgstr "Codice di risposta micca accettevule" -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" -msgstr "Cundizioni di ricerca micca leghjittimi : %s" +msgstr "Cundizioni di ricerca micca accettevule : %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: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 "Passeghju di situ micca leghjittimu" +msgstr "Passeghju di situ micca accettevule" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" -msgstr "Dimensione micca leghjittima in a cundizione" +msgstr "Dimensione micca accettevule in a cundizione" #: ../../locales/../src/engine/server.cpp:132 msgid "Invalid username given." -msgstr "Nome d'utilizatore indicatu micca leghjittimu." +msgstr "Nome d'utilizatore indicatu micca accettevule." -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" -msgstr "Valore micca leghjittima per ai_flags" +msgstr "Valore micca accettevule per ai_flags" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" -msgstr "Valore micca leghjittima per i cunsiglii" +msgstr "Valore micca accettevule per i cunsiglii" -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "Paese di ghjuridizzione :" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Cità di ghjuridizzione :" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Pruvincia di ghjuridizzione :" @@ -4775,7 +4857,7 @@ msgid "Keep directories on top" msgstr "Mentene i cartulari in capu" -#: ../../locales/../src/interface/Mainfrm.cpp:672 +#: ../../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 " @@ -4786,7 +4868,7 @@ "FileZilla fà qualchì prova per verificà s'è u servu supporta sta funzione, " "ma a prova pò fiascà." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "Scambiu di chjave" @@ -4794,6 +4876,13 @@ 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 +msgid "Key file" +msgstr "Schedariu di chjave" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "A più bassa" @@ -4803,13 +4892,13 @@ msgid "Language" msgstr "Lingua" -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Lingua mudificata" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:376 +#: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" msgstr "Mudificatu u" @@ -4837,7 +4926,7 @@ msgid "Limit:" msgstr "Limitazione :" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Lunghezza di a linea trapassata" @@ -4845,13 +4934,14 @@ msgid "Linked against" msgstr "Cumpunenti ligati" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Socket d'ascoltu chjosu" -#: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/engine/logging.cpp:118 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "Cuntenutu :" @@ -4859,42 +4949,42 @@ msgid "Lo&west available port:" msgstr "P&ortu u più bassu dispunibule :" -#: ../../locales/../src/interface/edithandler.cpp:1148 -#: ../../locales/../src/interface/edithandler.cpp:1402 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Lucale" -#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Indirizzu lucale impiegatu" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "U puntu lucale di cumpiitura hè statu chjosu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Schedariu lucale" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "U schedariu lucale ùn esiste micca." -#: ../../locales/../src/interface/updater.cpp:434 -#: ../../locales/../src/interface/updater.cpp:526 +#: ../../locales/../src/interface/updater.cpp:371 +#: ../../locales/../src/interface/updater.cpp:463 #, c-format msgid "Local file is %s\n" msgstr "U schedariu lucale hè %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 "U schedariu lucale hè unu cartulare è micca unu schedariu classicu." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." -msgstr "U schedariu lucale ùn hà micca unu nome sanu." +msgstr "U schedariu lucale ùn hà micca un nome sanu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Filtri lucale :" @@ -4902,7 +4992,7 @@ msgid "Local site:" msgstr "Situ lucale :" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Cummuna :" @@ -4952,17 +5042,17 @@ "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:880 -#: ../../locales/../src/interface/queue.cpp:967 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Bassu" -#: ../../locales/../src/interface/queue.cpp:878 -#: ../../locales/../src/interface/queue.cpp:965 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "U più bassu" -#: ../../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 "" "U numeru u più bassu di u portu dispunibule deve esse sceltu trà 1024 è " @@ -4972,50 +5062,50 @@ msgid "MAC:" msgstr "MAC :" -#: ../../locales/../src/interface/xmlfunctions.cpp:43 +#: ../../locales/../src/interface/xmlfunctions.cpp:44 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:792 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../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 "Ingutuppu malcunciliu di dati : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "In-capu malcunciliu : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 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: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: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 "Trasferimentu manuale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Currisponde à tutte ste cundizioni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Currisponde à almenu una di ste cundizioni" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Ùn currisponde à alcuna di ste cundizioni" @@ -5023,12 +5113,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Numeru di trasferimenti simultanei :" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Fiascu per riservà memoria" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1832 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Ghjurnale di i messaghji" @@ -5036,7 +5126,7 @@ msgid "Message log position" msgstr "Pusizione di u ghjurnale di i messaghji" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Messaghju troppu longu" @@ -5044,29 +5134,29 @@ msgid "MiB" msgstr "MiO" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "Minuti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Move in&ghjò" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Move in&sù" -#: ../../locales/../src/interface/LocalTreeView.cpp:1002 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "U mo Urdinatore" -#: ../../locales/../src/interface/LocalTreeView.cpp:992 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "I mo Ducumenti" -#: ../../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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "I mo Siti" @@ -5075,22 +5165,21 @@ msgid "N/a" msgstr "M/d" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" msgstr "Stu nome esiste dighjà" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 +#: ../../locales/../src/interface/sitemanager.cpp:695 msgid "Name of bookmark already exists." msgstr "U nome di l'indetta esiste dighjà." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 msgid "Name:" msgstr "Nome :" @@ -5098,23 +5187,23 @@ msgid "Natural sort" msgstr "Classificazione naturale" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Ci vole à indicà un nome per u filtru" -#: ../../locales/../src/interface/search.cpp:363 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" -msgstr "Ci vole à indicà un passeghju alluntanatu leghjittimu" +msgstr "Ci vole à indicà un passeghju alluntanatu accettevule" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Ci vole à indicà una cudificazione di caratteru" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1079 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:1059 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5122,8 +5211,8 @@ "L'ospite di a reta ùn hà mancunu indirizzu di reta in a famiglia d'indirizzi " "richiesta" -#: ../../locales/../src/engine/proxy.cpp:473 -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Reta inaccessibile" @@ -5139,37 +5228,37 @@ msgid "New &tab" msgstr "&Nova unghjetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Nova Indetta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 +#: ../../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:816 -#: ../../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: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 "Nova indetta" -#: ../../locales/../src/interface/LocalTreeView.cpp:1151 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1270 +#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1306 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "Novu cartulare" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:51 #, c-format msgid "New features and improvements in %s" msgstr "Innuvazioni è megliuranze di a versione %s" @@ -5178,25 +5267,25 @@ msgid "New filter" msgstr "Novu filtru" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" msgstr "Novu cartulare" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Novu situ" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" -msgstr "Seguente in a lista d'aspettanza di trasferimentu" +msgstr "Seguente in a lista d'attesa di trasferimentu" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "No" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Alcunu indirizzu assuciatu cù u nome di nodu" @@ -5204,16 +5293,16 @@ msgid "No category to export selected" msgstr "Alcuna categuria selezziunata per l'espurtazione" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Alcuna cummanda indicata, abbandonu in corsu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 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:1089 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Alcunu schedariu in corsu di mudificazione." @@ -5231,88 +5320,88 @@ msgid "No images available" msgstr "Alcuna imaghjina dispunibule" -#: ../../locales/../src/interface/QueueView.cpp:3008 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" -msgstr "Ùn ci sò più di schedarii in a lista d'aspettanza !" +msgstr "Ùn ci hè più di schedariu in a lista d'attesa !" -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "U gruppu di filtri ùn hà micca di nome." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 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:2872 +#: ../../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 ci hè alcunu prugrammu per mudificà i schedarii cù l'estensione '%s'." -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Alcunu trasferimentu ver di l'ospite" -#: ../../locales/../src/interface/search.cpp:227 +#: ../../locales/../src/interface/search.cpp:255 msgid "No search results" msgstr "Alcunu risultatu di ricerca" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Alcunu situ dispunibule" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Metodu d'autenticazione SOCKS5 micca suppurtatu" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 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/verifycertdialog.cpp:58 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Alcunu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Mancunu selezziunatu" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Nurmale" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:312 +#: ../../locales/../src/interface/queueview_failed.cpp:337 msgid "Not all items could be requeued for transfer." msgstr "" -"Micca tutti l'elementi ùn ponu esse rimessi in a lista d'aspettanza per u " +"Micca tutti l'elementi ùn ponu esse rimessi in a lista d'attesa per u " "trasferimentu." -#: ../../locales/../src/interface/state.cpp:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Micca cunnettu" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Micca cunnettu à alcunu servu" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Micca cunnettu à alcunu servu." @@ -5320,11 +5409,11 @@ msgid "Not connected." msgstr "Micca cunnettu." -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Micca dimaratu, ci vole à chjamà WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:670 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5345,39 +5434,43 @@ 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:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 msgid "O&pen file" msgstr "A&pre u schedariu" #: ../../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: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 "Versione OS :" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5386,7 +5479,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:834 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Solu una volta" @@ -5398,11 +5491,11 @@ msgid "Once a week" msgstr "Una volta per settimana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Only use plain FTP (insecure)" msgstr "Impiegà solu FTP nurmale (senzà sicurità)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Apre u cartulare in u ghjestiunariu di schedarii di u sistemu" @@ -5427,14 +5520,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Apre u dialogu di e preferenze di FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Apertu cum'è :" -#: ../../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:1616 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/LocalListView.cpp:1712 msgid "Opening failed" msgstr "Apertura fiasca" @@ -5453,27 +5546,23 @@ "Affissà u dialogu di i filtri di i cartulari. Cliccu dirittu per attivà/" "disattivà i filtri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:777 -msgid "Operating system" -msgstr "Sistemu d'operazione" - -#: ../../locales/../src/interface/FileZilla.cpp:306 -msgid "Operating system problem detected" -msgstr "Un errore s'hè affacatu in u sistemu d'operazione" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Sistema d'Operazione :" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Operazione dighjà in corsu" -#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Operazione in corsu" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Operazione micca suppurtata" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Urganismu :" @@ -5481,16 +5570,16 @@ msgid "Other SFTP options" msgstr "Altre ozzioni SFTP" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Altru sbagliu di u sistemu" -#: ../../locales/../src/interface/verifycertdialog.cpp:237 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Altru :" -#: ../../locales/../src/engine/socket.cpp:1033 -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Mancanza di memoria" @@ -5502,30 +5591,30 @@ msgid "Overwrite &if source newer" msgstr "R&impiazzà s'è l'urigine hè più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 +#: ../../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 "Rimpiazzà u schedariu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 +#: ../../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 "Rimpiazzà u schedariu s'è a dimensione hè sfarente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 +#: ../../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 "" "Rimpiazzà u schedariu s'è a dimensione hè sfarente o l'urigine hè più recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 +#: ../../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" @@ -5539,7 +5628,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:282 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Vostru tipu di custruzzione : %s\n" @@ -5548,8 +5637,8 @@ msgid "Owner permissions" msgstr "Permessi di u pruprietariu" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:378 +#: ../../locales/../src/interface/search.cpp:114 msgid "Owner/Group" msgstr "Pruprietariu / Gruppu" @@ -5566,7 +5655,7 @@ msgid "P&roxy host:" msgstr "Ospite p&roxy :" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "A cummanda PORT hè statu alterata da u 'router' o u parafocu." @@ -5574,18 +5663,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivu (ricumandatu)" -#: ../../locales/../src/interface/Mainfrm.cpp:2401 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" -msgstr "U parametru ùn hè micca un URL leghjittima" +msgstr "U parametru ùn hè micca un URL accettevule" -#: ../../locales/../src/interface/updater.cpp:606 +#: ../../locales/../src/interface/updater.cpp:543 #, 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:2447 +#: ../../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 "&Parolla d'intrata :" @@ -5598,56 +5687,56 @@ msgid "Passive mode" msgstr "Modu passivu" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "" "U modu passivu hè statu sceltu cum'è modu predefinitu di trasferimentu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:283 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "A parolla d'intrata hè richiesta" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/search.cpp:109 msgid "Path" msgstr "Passeghju" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3121 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2258 +#: ../../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 "" "U passeghju ùn pò micca esse custruttu per u cartulare %s è sottu-cartulare " "%s" -#: ../../locales/../src/interface/Mainfrm.cpp:2358 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "U passeghju ùn esiste micca :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Passeghji" -#: ../../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:1111 +#: ../../locales/../src/interface/edithandler.cpp:1248 +#: ../../locales/../src/interface/edithandler.cpp:1338 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Pending removal" -msgstr "In aspettanza di ritiru" +msgstr "In attesa di ritiru" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:145 msgid "Permission" msgstr "Permessu" -#: ../../locales/../src/engine/socket.cpp:1026 -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Permessu ricusatu" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:377 +#: ../../locales/../src/interface/search.cpp:113 msgid "Permissions" msgstr "Permessi" @@ -5655,7 +5744,7 @@ msgid "Platform:" msgstr "Piattaforma :" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5671,13 +5760,13 @@ "Cunfigurate i vostri 'router' è parafochi di manera chì FileZilla possa " "stabilisce cunnessioni surtente nantu à porti scelti arbitrariamente." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5693,7 +5782,7 @@ msgid "Please enter a custom time format." msgstr "Scrivite una forma persunalizata d'ora." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../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 "Scrivite una data in a forma AAAA-MM-GG cum'è per indettu 2010-07-18." @@ -5714,7 +5803,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:391 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Scrivite un novu nome per u gruppu di filtri \"%s\"" @@ -5749,7 +5838,7 @@ msgid "Please enter a password for this server:" msgstr "Scrivite una parolla d'intrata per stu servu :" -#: ../../locales/../src/interface/QueueView.cpp:2133 +#: ../../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" @@ -5764,10 +5853,10 @@ msgid "" "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -"Scrivite un numeru sceltu trà 10 è 9999 seconde per u cumportu d'aspettanza " -"o 0 per disattivà i cumporti d'aspettanza." +"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:335 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Scrivite un nome unicu per stu gruppu di filtri" @@ -5775,11 +5864,11 @@ msgid "Please enter a username for this server:" msgstr "Scrivite un nome d'utilizatore per stu servu :" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." -msgstr "Scrivite una stesa di porti leghjittima." +msgstr "Scrivite una stesa di porti accettevule." -#: ../../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 "Scrivite un URL induve si trova u vostru indirizzu esternu" @@ -5790,7 +5879,7 @@ msgstr "" "Scrivite un limitu di velocità di l'incaricamenti più maiò o uguale à 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5798,14 +5887,14 @@ "Scrivite una cummanda FTP cruda.\n" "L'impiegu d'una tale cummanda spurgulerà u 'cache' di u cartulare." -#: ../../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: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 "Scrivite u nome di u cartulare chì hà da esse creatu :" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Scrivite u nome di u schedariu chì hà da esse creatu :" @@ -5813,12 +5902,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:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Scrivite u vostru indirizzu IP esternu" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5837,7 +5926,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:632 +#: ../../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." @@ -5846,12 +5935,12 @@ "è chì l'indirizzu di u risolutore d'indirizzi sia statu scrittu " "currettamente." -#: ../../locales/../src/interface/FileZilla.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:157 msgid "Please make sure the requested locale is installed on your system." msgstr "" "Assicuratevvi chì a lingua richiesta sia installata nantu à u vostru sistemu." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5876,7 +5965,7 @@ "periculosi. Quessu pò generà un alarmu falsu chì pò esse ignuratu senza " "penseri." -#: ../../locales/../src/interface/Mainfrm.cpp:710 +#: ../../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." @@ -5892,7 +5981,7 @@ "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:585 +#: ../../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 " @@ -5901,11 +5990,11 @@ "Impiegate torna st'assistente s'è u vostru ambiente cambia o s'elli ci sò " "prublemi avà cù servi chì funzionavanu bè prima." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Selezziunate un azzione :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." msgstr "Selezziunate e categurie chì ci vole à impurtà." @@ -5914,31 +6003,31 @@ msgstr "" "Selezziunate u modu predefinitu di trasferimentu ch'ellu ci vole à impiegà." -#: ../../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 "Selezziunate i novi attributi per u cartulare \"%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 "Selezziunate i novi attributi per u schedariu \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Selezziunate i novi attributi per i cartulari selezziunati." -#: ../../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 "" "Selezziunate i novi attributi per i schedarii è i cartulari selezziunati." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Selezziunate i novi attributi per i schedarii selezziunati." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5957,8 +6046,8 @@ msgid "Positio&n of the message log:" msgstr "Pusizio&ne di u ghjurnale di i messaghji :" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 -#: ../../locales/../src/interface/verifycertdialog.cpp:223 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "Codice pustale :" @@ -5970,12 +6059,12 @@ msgid "Preallocation" msgstr "Preallucazione" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Siti Predefiniti" -#: ../../locales/../src/interface/Mainfrm.cpp:709 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Cunservà data è ora di i schedarii" @@ -5983,7 +6072,7 @@ msgid "Preview:" msgstr "Avvistu :" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "" "I certificati di a cunnessione primaria è di a cunnessione di dati ùn " @@ -6001,7 +6090,7 @@ msgid "Prioritize directories (default)" msgstr "Dà a priurità à i cartulari (predefinitu)" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Priurità" @@ -6030,17 +6119,23 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 #: ../../locales/../src/interface/resources/xrc/menus.xrc:338 msgid "Process &Queue" -msgstr "Trattà è mette in a &lista d'aspettanza" +msgstr "Trattà è mette in a &lista d'attesa" -#: ../../locales/../src/engine/socket.cpp:1031 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Trapienu di a tavula di schedariu di prucedutu" -#: ../../locales/../src/engine/socket.cpp:1036 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#, c-format +msgid "Processed %s in %s." +msgstr "Trattatu %s di %s." + +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protocollu micca suppurtatu" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protocollu micca suppurtatu per u tipu di socket specificatu" @@ -6057,41 +6152,45 @@ msgid "Proxy &user:" msgstr "&Utilizatore di u proxy :" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Fiascu di l'autenticazione di u Proxy" -#: ../../locales/../src/engine/transfersocket.cpp:95 -#: ../../locales/../src/engine/transfersocket.cpp:107 +#: ../../locales/../src/engine/transfersocket.cpp:105 +#: ../../locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "Fiascu di u toccamanu di u proxy : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:312 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Risposta di u Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:367 -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" msgstr "A richiesta à u proxy hè fiasca : %s" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:559 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:4321 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "" -"Proxy specificatu ma l'ospite di u proxy, o u portu, ùn hè micca leghjittimu" +"Proxy specificatu ma l'ospite di u proxy, o u portu, ùn hè micca accettevule" #: ../../locales/../src/interface/resources/xrc/settings.xrc:616 msgid "Public Key Authentication" @@ -6105,32 +6204,32 @@ msgid "Public permissions" msgstr "Permessi publichi" -#: ../../locales/../src/interface/QueueView.cpp:3088 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" -msgstr "A lista d'aspettanza hè stata cumpletamente trattata" +msgstr "A lista d'attesa hè stata cumpletamente trattata" -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" -msgstr "Lista d'aspettanza : %s MiO" +msgstr "Lista d'attesa : %s MiO" -#: ../../locales/../src/interface/statusbar.cpp:364 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" -msgstr "Lista d'aspettanza : %s%s" +msgstr "Lista d'attesa : %s%s" -#: ../../locales/../src/interface/statusbar.cpp:360 -#: ../../locales/../src/interface/statusbar.cpp:418 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" -msgstr "Lista d'aspettanza : viota" +msgstr "Lista d'attesa : viota" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" -msgstr "Schedarii in a lista d'aspettanza" +msgstr "Schedarii in a lista d'attesa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" -msgstr "Lista d'aspettanza :" +msgstr "Lista d'attesa :" #: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "R&eboot system" @@ -6140,13 +6239,12 @@ msgid "R&emote directory tree" msgstr "Arburiscenza di u cartulare all&untanatu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" -msgstr "" -"Riavvià è rim&ette tutti i schedarii selezziunati in a lista d'aspettanza" +msgstr "Riavvià è rim&ette tutti i schedarii selezziunati in a lista d'attesa" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Cummanda FTP cruda" @@ -6163,7 +6261,7 @@ msgid "Re&name" msgstr "Ri&numà" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6179,12 +6277,12 @@ msgid "Read-only" msgstr "Lettura sola" -#: ../../locales/../src/interface/Mainfrm.cpp:1061 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Site sicuru di vulè abbandunà l'operazione in corsu ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:736 +#: ../../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 "" @@ -6194,37 +6292,37 @@ msgstr[1] "" "Site sicuru di vulè caccià %d cartulari cù i so cuntenuti di u servu ?" -#: ../../locales/../src/interface/RemoteListView.cpp:1411 -#: ../../locales/../src/interface/search.cpp:734 +#: ../../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] "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:1418 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1387 +#: ../../locales/../src/interface/search.cpp:744 #, 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:1072 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 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 " "u servu ?" -#: ../../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 "" "Site sicuru di vulè caccià tutti i schedarii è/o i cartulari selezziunati di " "u vostru urdinatore ?" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Raghjone" -#: ../../locales/../src/interface/QueueView.cpp:3081 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Riavvià l'urdinatore avà" @@ -6232,36 +6330,36 @@ msgid "Rec&urse into subdirectories" msgstr "Inc&urpurà i sottu-cartulari" -#: ../../locales/../src/engine/tlssocket.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, 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:3021 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2022 -#: ../../locales/../src/engine/directorylistingparser.cpp:2036 +#: ../../locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 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:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "I dati ricevuti sò alterati" -#: ../../locales/../src/interface/updater.cpp:585 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" -msgstr "Caratteri micca leghjittimi ricevuti in l'infurmazione di versione" +msgstr "Caratteri micca accettevule ricevuti in l'infurmazione di versione" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:578 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "L'infurmazione di versione ricevuta hè troppu maiò" @@ -6283,120 +6381,132 @@ msgid "Reconnects to the last used server" msgstr "Si cunnetta torna à l'ultimu servu adupratu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +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 +msgid "Recursively changing permissions." +msgstr "Cambià i permessi da una manera recursiva." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +msgid "Recursively deleting files and directories." +msgstr "Squassà cartulari è schedarii da una manera recursiva." + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" -msgstr "Ridirezzione verdi un URL micca leghjittimu o micca suppurtatu : %s" +msgstr "Ridirezzione ver di un URL micca accettevule o micca suppurtatu : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "" -"Ridirezzione verdi un indirizzu micca leghjittimu o micca suppurtatu : %s" +"Ridirezzione ver di un indirizzu micca accettevule o micca suppurtatu : %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:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Arricurdassi di e parolle d'intrata ?" -#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" msgstr "Alluntanatu" -#: ../../locales/../src/engine/tlssocket.cpp:833 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Certificatu alluntanatu micca degnu di cridenza." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Schedariu alluntanatu" -#: ../../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/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 "Ricerca di schedarii alluntanati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Filtri alluntanati :" -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Passeghju alluntanatu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../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 "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " -"hè un passeghju esplicitu leghjittimu è suppurtatu da u tipu di servu (%s) " +"hè un passeghju esplicitu accettevule è suppurtatu da u tipu di servu (%s) " "di u situ currente." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../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 "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " -"hè un passeghju esplicitu leghjittimu è suppurtatu da u tipu di servu (%s) " +"hè un passeghju esplicitu accettevule è suppurtatu da u tipu di servu (%s) " "selezziunatu nantu à u situ parente." -#: ../../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: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 "" "U passeghju alluntanatu ùn pò micca esse determinatu. Assicuratevvi ch'ellu " -"hè un passeghju esplicitu leghjittimu." +"hè un passeghju esplicitu accettevule." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "U passeghju alluntanatu ùn hà micca pussutu esse determinatu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Trattamentu di u passeghju alluntanatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Passeghju alluntanatu :" -#: ../../locales/../src/interface/viewheader.cpp:533 +#: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" msgstr "Situ alluntanatu :" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" msgstr "Caccià &tuttu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" msgstr "&Caccià l'elementi selezziunati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../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/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Rinumà u schedariu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Rename selected directory" msgstr "Rinumà u cartulare selezziunatu" @@ -6405,72 +6515,72 @@ msgid "Rename selected files and directories" msgstr "Rinumà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3471 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2457 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Rinumà '%s' ver di '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Riferisce un prublemu o dumandà un migliuramentu" -#: ../../locales/../src/engine/proxy.cpp:358 +#: ../../locales/../src/engine/proxy.cpp:398 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:361 +#: ../../locales/../src/engine/proxy.cpp:401 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:355 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Richiesta ricusata o fiasca" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "Richiede FTP esplicitu cù TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "Richiede FTP sottintesu cù TLS" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" -msgstr "Riavvià è rimette tutti i schedarii in a lista d'&aspettanza" +msgstr "Riavvià è rimette tutti i schedarii in a lista d'&attesa" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "U protoccollu risoltu hè scunnisciutu" -#: ../../locales/../src/engine/ControlSocket.cpp:1079 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "Risuluzione di l'indirizzu di %s" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Risorse timpurariamente indispunibule" -#: ../../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:113 +#: ../../locales/../src/interface/netconfwizard.cpp:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Risposta :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Risultati :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../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" @@ -6484,19 +6594,19 @@ "U ripigliu di u trasferimentu di i schedarii ASCII pò causà prublemi s'ell'u " "servu impiega una forma sfarenta di fine di linea chì quella di u cliente." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1277 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Ricuperazione di a lista di u cartulare \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Ricuperazione di a lista di u cartulare..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ricuperazione di l'indirizzu IP esternu dapoi %s" @@ -6513,7 +6623,7 @@ msgid "S&hutdown system" msgstr "Piantà l'urdinatore" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "Pian&tà" @@ -6533,7 +6643,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:137 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "U proxy SOCKS4 hà da cunnettassi à : %s" @@ -6542,35 +6652,35 @@ msgid "SQLite:" msgstr "SQLite :" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Arregistrà e preferenze ?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../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 "" "L'arregistramentu di e parolle d'intrata hè statu disattivatu da u vostru " "amministratore." -#: ../../locales/../src/interface/manual_transfer.cpp:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "Saving of passwords has been disabled by you." msgstr "Avete disattivatu l'arregistramentu di e parolle d'intrata." -#: ../../locales/../src/interface/QueueView.cpp:1717 +#: ../../locales/../src/interface/QueueView.cpp:1710 msgid "Scanning for files to add to queue" -msgstr "Esame di i schedarii à aghjunghje à a lista d'aspettanza" +msgstr "Esame di i schedarii à aghjunghje à a lista d'attesa" -#: ../../locales/../src/interface/QueueView.cpp:1719 +#: ../../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:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Cundizioni di ricerca :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Passeghju &di ricerca :" @@ -6582,16 +6692,16 @@ msgid "Search server for files" msgstr "Ricerca di schedarii in u servu" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Infurmazione di sicurità" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 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:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Selezziunà u servu" @@ -6610,7 +6720,7 @@ "Selezziunà un azzione predefinita à fà s'è u schedariu di destinazione d'un " "trasferimentu esiste dighjà." -#: ../../locales/../src/interface/edithandler.cpp:1565 +#: ../../locales/../src/interface/edithandler.cpp:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Selezziunà l'editore predefinitu" @@ -6632,7 +6742,7 @@ "trasferimentu esiste dighjà. Sta selezzione hè vera per i schedarii " "selezziunati solu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:359 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Selezziunà u schedariu cuntenendu a chjave privata" @@ -6641,15 +6751,16 @@ msgstr "Selezziunà u schedariu per l'espurtazione di i dati" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" -msgstr "Selezziunà u schedariu per l'espurtazione di a lista d'aspettanza" +msgstr "Selezziunà u schedariu per l'espurtazione di a lista d'attesa" #: ../../locales/../src/interface/export.cpp:36 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:2126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "Selezziunà u schedariu per l'espurtazione di i siti" @@ -6657,35 +6768,35 @@ msgid "Select file to import settings from" msgstr "Selezziunà u schedariu per l'impurtazione di e preferenze" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Selezziunà u schedariu à incaricà" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:305 -msgid "Select filename for converted keyfile" -msgstr "Selezziunà u nome di schedariu per a chjave privata convertitta" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" +msgstr "Selezziunà u nome per u schedariu di chjave convertitta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Selezziunà chì manera à impiegà per apre sti schedarii." -#: ../../locales/../src/interface/search.cpp:482 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Selezziunà u cartulare di destinazione per i telecaricamenti" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Selezziunà u nome di schedariu di destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" msgstr "Selezziunà e categurie à espurtà :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 msgid "Select the private data you would like to delete." -msgstr "Selezziunà i dati persunali ch'ellu ci vole à sguassà." +msgstr "Selezziunà i dati persunali ch'ellu ci vole à squassà." -#: ../../locales/../src/interface/search.cpp:450 +#: ../../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." @@ -6699,7 +6810,7 @@ msgstr[0] "%d cartulare selezziunatu." msgstr[1] "%d cartulari selezziunati." -#: ../../locales/../src/interface/search.cpp:448 +#: ../../locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6720,7 +6831,7 @@ msgstr[0] "%d schedariu selezziunatu. Dimensione tutale : Almenu %s" msgstr[1] "%d schedarii selezziunati. Dimensione tutale : Almenu %s" -#: ../../locales/../src/interface/search.cpp:454 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s è %s selezziunati per u trasferimentu." @@ -6735,34 +6846,34 @@ msgid "Selected %s and %s. Total size: At least %s" msgstr "%s è %s selezziunati. Dimensione tutale : Almenu %s" -#: ../../locales/../src/interface/edithandler.cpp:1510 -#: ../../locales/../src/interface/edithandler.cpp:1585 +#: ../../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 "L'editore selezziunatu ùn esiste micca." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "U schedariu selezziunatu hè dighjà in corsu di mudificazione" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "U schedariu selezziunatu hè dighjà caricatu" -#: ../../locales/../src/interface/edithandler.cpp:1683 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "U schedariu selezziunatu hè dighjà apertu" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1720 msgid "Selected file is still being edited" msgstr "U schedariu selezziunatu hè torna in corsu di mudificazione" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "U filtru selezziunatu funziuneghja solu per i schedarii lucali." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../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." @@ -6771,7 +6882,7 @@ "sfarente.\n" "Impiegate un indetta particulare à u situ per stu servu." -#: ../../locales/../src/engine/engineprivate.cpp:288 +#: ../../locales/../src/engine/engineprivate.cpp:291 msgid "Selected port usually in use by a different protocol." msgstr "" "D'abbitudine, u portu selezziunatu hè impiegatu da un altru protoccollu." @@ -6785,36 +6896,36 @@ msgstr "" "Mandà una cummanda persunalizata à u servu s'ellu ùn hè micca dispunibule" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4399 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Serial number:" msgstr "Numeru di seria :" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "&Tipu di servu :" -#: ../../locales/../src/engine/tlssocket.cpp:722 +#: ../../locales/../src/engine/tlssocket.cpp:743 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:892 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "U servu ùn supporta micca i caratteri micca ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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 " "dimensione > %d Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4229 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6824,19 +6935,19 @@ "dimensione > %d Go. A fine di u trasferimentu si ferà quandu a dimensione di " "i schedarii lucale & servu currisponderà." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "" "U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > 2 Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2486 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "" "U servu ùn supporta micca u ripigliu di trasferimentu per i schedarii cù una " "dimensione > 4 Go." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4244 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6854,11 +6965,11 @@ "U servu pò richiede un contu. Pruvate d'indicà un contu impieghendu u " "Ghjestiunariu di Siti" -#: ../../locales/../src/engine/ControlSocket.cpp:340 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "U servu hà riturnatu un passeghju viotu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6866,13 +6977,13 @@ "U servu hà mandatu una richiesta cumplementare d'identificazione. Ci vole à " "impiegà un tipu interattivu d'identificazione." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3797 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3791 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6881,35 +6992,35 @@ "Indirizzu rimpiazzatu da quellu di u servu." #: ../../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: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 "U servu hà mandatu una risposta micca prevista." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "MAC per a cunnessione servu à cliente :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Cudificazione per a cunnessione servu à cliente :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "&Tipu di servu :" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Schedariu Servu / Lucale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Servu :" @@ -6921,13 +7032,13 @@ msgid "Set &Priority" msgstr "Definisce a priurità" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2336 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Definisce i permessi da '%s' à '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:760 +#: ../../locales/../src/engine/transfersocket.cpp:791 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize chjamatu senza socket" @@ -6935,6 +7046,10 @@ msgid "Settings" msgstr "Preferenze di FileZilla" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Cartulare di preferenze :" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Presentà a lista c&ruda di u cartulare" @@ -6943,7 +7058,7 @@ msgid "Show &welcome dialog..." msgstr "Presentà u dialogu di &benvenuta..." -#: ../../locales/../src/interface/Mainfrm.cpp:2248 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Presentà l'arburiscenze per i dui lati è cuntinuà u paragone ?" @@ -6956,7 +7071,7 @@ msgstr "" "Presentà i ditaglii apprupositu di e forme persunalizate di data è d'ora" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 msgid "Shows available TLS ciphers" msgstr "Presentà e cudificazioni TLS dispunibule" @@ -6964,7 +7079,7 @@ msgid "Shows this help dialog" msgstr "Presentà stu dialogu d'aiutu" -#: ../../locales/../src/interface/QueueView.cpp:3077 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Piantà u sistemu" @@ -6972,7 +7087,7 @@ msgid "Signature algorithm:" msgstr "Cudificazione di a firma :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "Elementi di u Ghjestiunariu di Siti" @@ -6980,55 +7095,56 @@ msgid "Site Manager" msgstr "Ghjestiunariu di Siti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 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: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: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:1103 +#: ../../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 "Ghjestiunariu di Siti - Dati micca leghjittimi" +msgstr "Ghjestiunariu di Siti - Dati micca accettevule" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 msgid "Site Manager already open" msgstr "U Ghjestiunariu di Siti hè dighjà apertu" -#: ../../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: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 "U situ ùn esiste micca." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:411 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:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../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 "U passeghju di situ hè malfuttutu." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" msgstr "Indette particulare per stu situ" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../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" @@ -7038,7 +7154,7 @@ "in u Ghjestiunariu di Siti.\n" "Vulete aghjunghje l'ozzioni di sta cunnessione à u Ghjestiunariu di Siti ?" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Dimensione" @@ -7050,50 +7166,50 @@ msgid "Size unknown" msgstr "Dimensione scunnisciuta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../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 "Saltà u schedariu" -#: ../../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: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 "Saltà u telecaricamentu di %s" -#: ../../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/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 "Saltà l'incaricamentu di %s" -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "L'indirizzu di socket hè fora di u spaziu d'indirizzi" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket dighjà cunnettu" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Socket hè statu piantatu" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket micca cunnettu" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Tipu di socket micca suppurtatu per a famiglia d'indirizzi" -#: ../../locales/../src/interface/Mainfrm.cpp:1196 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 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 " @@ -7112,7 +7228,7 @@ msgid "Sort directories inline" msgstr "Classificà i cartulari in-linea" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "L'ordine di classificazione ùn pò micca esse mudificatu mentre u paragone di " @@ -7126,12 +7242,12 @@ msgid "Sorting &mode:" msgstr "Modu di classificazione :" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 msgid "Source and path of the drop operation are identical" msgstr "" "L'urigine è u passeghju di l'operazione di Sguillà & Depone sò listessi" -#: ../../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 "U schedariu d'urigine è di destinazione ùn ponu micca esse listessi" @@ -7144,7 +7260,7 @@ msgid "Source file:" msgstr "Schedariu d'urigine :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 +#: ../../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" @@ -7154,13 +7270,13 @@ msgid "Speed limits" msgstr "Limiti di velocità per i trasferimenti" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "" "A limitazione di velocità per i trasferimenti hè disattiva, cliccu per " "cambià." -#: ../../locales/../src/interface/statusbar.cpp:576 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "" "A limitazione di velocità per i trasferimenti hè attiva, cliccu per cambià." @@ -7177,7 +7293,7 @@ msgid "Stable, beta and nightly versions" msgstr "Versioni stabule, beta è create di notte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Principià u trasferimentu &avà" @@ -7185,19 +7301,19 @@ msgid "Start with opened Site Manager" msgstr "Principià cù l'apertura di u Ghjestiunariu di Siti" -#: ../../locales/../src/interface/updater.cpp:276 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Iniziu di u cuntrolu automaticu di e nove versioni in %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2192 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Lanciu di u telecaricamentu di %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2195 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Lanciu di l'incaricamentu di %s" @@ -7206,18 +7322,18 @@ msgid "Starts the local site in the given path" msgstr "Lancia u situ lucale in u passeghju indicatu" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Statu o pruvincia :" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Statu" -#: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:288 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Statu :" @@ -7225,7 +7341,11 @@ msgid "Stop and remove &all" msgstr "Pi&antà è caccià tuttu" -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +msgid "Stop recursive operation" +msgstr "Piantà l'operazione recursiva" + +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Carrughju :" @@ -7241,40 +7361,41 @@ msgid "Summary of test results:" msgstr "Riassuntu di i resultati di a prova :" -#: ../../locales/../src/interface/QueueView.cpp:3085 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Mette in veghja subitu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." msgstr "" "E leie simboliche (symlink) ver di i schedarii ùn sò micca affette da sta " -"scelta, chì tale leie sò sempre sguassate." +"scelta, chì tale leie sò sempre squassate." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 #: ../../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: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 "Sfugliendu sincrunizatu" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:371 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:123 +#: ../../locales/../src/interface/quickconnectbar.cpp:122 msgid "Syntax error" msgstr "Sbagliu di sintassa" @@ -7283,8 +7404,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Sbagliu di sintassa in a linea di cummanda" @@ -7292,11 +7413,15 @@ msgid "System" msgstr "Sistemu" -#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Detaglii di u sistema" + +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "U limitu di u numeru di schedarii aperti hè ghjuntu" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "U sottu-sistemu reta di u sistemu hè fiascu" @@ -7304,20 +7429,19 @@ msgid "T&oolbar" msgstr "&Barra d'attrezzi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Cunnessione TLS stabilita, mandà d'una dumanda HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:388 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." -msgstr "" -"Cunnessione TLS stabilita, in aspettanza di u messaghju di benvenuta..." +msgstr "Cunnessione TLS stabilita, in attesa di u messaghju di benvenuta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Cunnessione TLS stabilita." -#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL scadutu" @@ -7329,16 +7453,16 @@ msgid "Target file:" msgstr "Schedariu di destinazione :" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "U nome di u schedariu di destinazione esiste dighjà !" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "" "U nome di u schedariu di destinazione esiste dighjà ! Vulete cuntinuà ?" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Fiascu timpurariu in a risuluzione di u nome" @@ -7346,11 +7470,17 @@ msgid "Test results" msgstr "Risultati di a prova" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4250 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Prova di a capacità di u servu à ripiglià i trasferimenti" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +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 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 " @@ -7368,34 +7498,29 @@ "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/xmlfunctions.cpp:389 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "U ducumentu XML ùn hè micca formatu bè : %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "L'indirizzu entritu era : %s" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "U membru ai_family ùn hè micca suppurtatu" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "U membru ai_socktype ùn hè micca suppurtatu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:802 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "L'indetta ùn pò micca esse aghjunta." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." -msgstr "L'indette ùn ponu micca esse sguassate." +msgstr "L'indette ùn ponu micca esse squassate." -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../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." @@ -7404,7 +7529,7 @@ msgid "" "The custom date format is invalid or contains unsupported format specifiers." msgstr "" -"A forma persunalizata di data ùn hè micca leghjittima o cuntene " +"A forma persunalizata di data ùn hè micca accettevule o cuntene " "specificazioni di forma micca suppurtate." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 @@ -7415,20 +7540,20 @@ msgid "" "The custom time format is invalid or contains unsupported format specifiers." msgstr "" -"A forma persunalizata d'ora ùn hè micca leghjittima o cuntene specificazioni " +"A forma persunalizata d'ora ùn hè micca accettevule o cuntene specificazioni " "di forma micca suppurtate." -#: ../../locales/../src/engine/transfersocket.cpp:131 +#: ../../locales/../src/engine/transfersocket.cpp:141 #, 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:2895 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../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 "L'editore predefinitu per i schedarii di testu ùn si trova micca." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "L'editore predefinitu per i schedarii di testu hè '%s'." @@ -7439,13 +7564,13 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "U nome di filtru indicatu esiste dighjà, sciglite un altru nome." -#: ../../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 "L'estensione '%s' esiste dighjà in sta 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" @@ -7454,8 +7579,8 @@ "U schedariu %s esiste dighjà.\n" "Scrivite un altru nome :" -#: ../../locales/../src/interface/edithandler.cpp:1656 -#: ../../locales/../src/interface/LocalListView.cpp:1711 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7466,20 +7591,29 @@ "U prugrammu assuciatu (%s) ùn si trova micca.\n" "Verificate i vostri associ da tipu di schedariu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:226 +#: ../../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 "" +"U schedariu '%s' cuntene una chjave SSH1. U protocollu SSH1 hè statu " +"disprezzatu, FileZilla suppurteghja solu e chjavi 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 "" "U schedariu '%s' ùn pò micca esse caricatu o ùn cuntene micca una chjave " "privata." -#: ../../locales/../src/interface/xmlfunctions.cpp:41 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, c-format msgid "The file '%s' could not be loaded." msgstr "U schedariu '%s' ùn pò micca esse caricatu." -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7489,8 +7623,8 @@ "Ùn ci hè micca di prugrammu assuciatu cù stu tipu di schedariu nantu u " "vostru sistemu." -#: ../../locales/../src/interface/edithandler.cpp:1768 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7499,20 +7633,20 @@ "U schedariu '%s' ùn pò micca esse apertu :\n" "A cummanda assuciata hè fiasca" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, 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 "" -"U schedariu '%s' ùn si trova micca in una forma suppurtata da FileZilla.\n" -"Di più, u schedariu hè pruttetu da una parolla d'intrata, cio ch'ùn hè ancu " -"suppurtatu da FileZilla.\n" -"Vulete trasfurmallu in una forma suppurtata è micca prutteta ?" +"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à ?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:269 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7521,22 +7655,11 @@ "U schedariu '%s' ùn si trova micca in una forma suppurtata da FileZilla.\n" "Vulete trasfurmallu in una forma suppurtata ?" -#: ../../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 "" -"U schedariu '%s' hè pruttetu da una parolla d'intrata, cio ch'ùn hè ancu " -"suppurtatu da FileZilla.\n" -"Vulete trasfurmallu in un schedariu micca pruttetu ?" - #: ../../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:79 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7550,12 +7673,12 @@ "d'utilizatore è a parolla d'intrata seranu impurtati.\n" "Vulete cuntinuà l'impurtazione ?" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 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:808 +#: ../../locales/../src/interface/listctrlex.cpp:809 msgid "The filename column cannot be hidden." msgstr "A culonna di u nome di schedariu ùn pò micca esse piattata." @@ -7569,15 +7692,15 @@ msgid "The following characters will be replaced: %s" msgstr "I caratteri seguente seranu rimpiazzati : %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 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:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "A soluzione FTP libera in 'Open Source'" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 msgid "The global bookmarks could not be saved." msgstr "L'indette glubale ùn ponu micca esse arregistrate." @@ -7595,7 +7718,17 @@ 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:275 +#: ../../locales/../src/interface/state.cpp:973 +#, 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 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "U cartulare lucale '%s' ùn esiste micca." + +#: ../../locales/../src/interface/state.cpp:250 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7605,7 +7738,7 @@ "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare lucale ?" -#: ../../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." @@ -7623,11 +7756,16 @@ "A nova versione hè statu arregistrata in u vostru cartulare di " "telecaricamenti." -#: ../../locales/../src/interface/QueueView.cpp:1841 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." -msgstr "A lista d'aspettanza ùn serà micca arregistrata." +msgstr "A lista d'attesa ùn serà micca arregistrata." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:885 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "U cartulare alluntanatu '%s' ùn esiste micca." + +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7638,30 +7776,30 @@ "Vulete disattivà u sfugliendu sincrunizatu è cuntinuà u cambiamentu di u " "cartulare alluntanatu ?" -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:76 msgid "The selected categories have been imported." msgstr "E categurie selezziunate sò statu impurtate." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 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:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../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 "U schedariu selezziunatu hè dighjà in corsu di mudificazione :" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1720 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:1661 +#: ../../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" @@ -7671,15 +7809,15 @@ "Quessu pò esse periculosu è dannighjà u vostru sistemu.\n" "Site sicuru di vulè cuntinuà ?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "U servu ùn pò micca esse aghjuntu." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 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:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "The server uses following charset encoding for filenames:" msgstr "" "U servu impiega a cudificazione di caratteri seguente per i nomi di " @@ -7693,7 +7831,7 @@ "U certificatu di u servu hè scunnisciutu. Verificate precisamente u " "certificatu per assicurassi chì u servu pò esse degnu di cridenza." -#: ../../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 " @@ -7703,7 +7841,7 @@ "Vole si dì chì l'amministratore hà cambiatu a chjave di l'ospite, o chì voi " "site in corsu di cunnessione à un altru urdinatore pritendendu esse u servu." -#: ../../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." @@ -7711,11 +7849,11 @@ "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:1079 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "U parametru nome di servu ùn hè micca suppurtatu per ai_socktype" -#: ../../locales/../src/interface/import.cpp:66 +#: ../../locales/../src/interface/import.cpp:73 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7723,21 +7861,21 @@ "E preferenze sò statu impurtate. Ci vole à rilancià FileZilla per piglialle " "in contu." -#: ../../locales/../src/engine/socket.cpp:1028 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "A famiglia d'indirizzi specificata ùn hè micca suppurtata" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "U nome di reta specificatu ùn hè più dispunibule" -#: ../../locales/../src/interface/QueueView.cpp:3080 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "" "L'urdinatore hè prontu hà ridimarrà, osinnò ci vole à cliccà nantu à " "Abbandunà." -#: ../../locales/../src/interface/QueueView.cpp:3076 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "" "L'urdinatore hè prontu hà piantassi, osinnò ci vole à cliccà nantu à " @@ -7751,30 +7889,30 @@ "U schedariu di destinazione esiste dighjà.\n" "Sciglite un azzione." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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:77 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 #, c-format msgid "The valid backup file %s could not be restored" -msgstr "U schedariu di copia %s ùn pò micca esse risturatu" +msgstr "U schedariu accettevule di copia %s ùn pò micca esse risturatu" #: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Temi" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Stu gruppu di filtru ùn pò micca esse cacciatu." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Stu gruppu di filtru ùn pò micca esse rinumatu." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7798,7 +7936,7 @@ "St'assistente hà da aiutavvi à cunfigurà currettamente tutti 'router' è " "parafochi è permette di pruvà a vostra cunfigurazione dopu." -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Ora" @@ -7808,33 +7946,29 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" -msgstr "Cump&ortu d'aspettanza in seconde :" +msgstr "Cump&ortu d'attesa in seconde :" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" -msgstr "Cumportu d'aspettanza" +msgstr "Cumportu d'attesa" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1666 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1030 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Sfarenza di i fusi orarii : Servu : %d seconde. Lucale : %d seconde. " -"Sfarenza : %d seconde." +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:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Titulu :" -#: ../../locales/../src/interface/Mainfrm.cpp:2246 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2247 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -7878,7 +8012,7 @@ #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" msgstr "" -"Attiva o disattiva u trattamentu di a lista d'aspettanza di i trasferimenti" +"Attiva o disattiva u trattamentu di a lista d'attesa di i trasferimenti" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 @@ -7898,19 +8032,19 @@ #: ../../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 "Affissa o piatta a finestra di a lista d'aspettanza di trasferimentu" +msgstr "Affissa o piatta a finestra di a lista d'attesa di trasferimentu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Linea d'in-capu troppu longa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Troppu di ridirezzioni" -#: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:282 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/engine/logging.cpp:114 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" msgstr "Traccia :" @@ -7919,7 +8053,7 @@ msgid "Transfer" msgstr "Trasferisce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "&Direzzione di u trasferimentu" @@ -7933,23 +8067,23 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" -msgstr "Lista d'aspettanza di trasferimentu" +msgstr "Lista d'attesa di trasferimentu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 msgid "Transfer Settings" msgstr "Preferenze di trasferimentu" -#: ../../locales/../src/engine/transfersocket.cpp:438 -#: ../../locales/../src/engine/transfersocket.cpp:460 +#: ../../locales/../src/engine/transfersocket.cpp:448 +#: ../../locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Cunnessione di trasferimentu interrotta : %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "I dati trasferiti sò statu alterati." -#: ../../locales/../src/interface/queue.cpp:391 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Trasferimentu in corsu" @@ -7958,8 +8092,8 @@ msgid "Transfers" msgstr "Trasferimenti" -#: ../../locales/../src/interface/QueueView.cpp:2976 -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2944 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "Transfers finished" msgstr "Trasferimenti cumpletti" @@ -7971,15 +8105,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Trattà sti tipi di schedarii cum'è schedarii ASCII :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Apprubazione di u cambiamentu di a chjave di l'ospite :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Apprubazione di a nova chjave di l'ospite :" -#: ../../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 "Appruvà a nova chjave è assucialla à a cunnessione ?" @@ -7987,7 +8121,7 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Appruvà stu certificatu è assuciallu à a cunnessione ?" -#: ../../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 "Appruvà stu servu è assuciallu à a cunnessione ?" @@ -7996,8 +8130,8 @@ msgid "Try again" msgstr "Pruvà torna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Tipu" @@ -8009,11 +8143,11 @@ msgid "Type of generic proxy:" msgstr "Tipu di proxy predefinitu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "&Incaricà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limitazione d'incaricamentu :" @@ -8023,25 +8157,25 @@ msgstr "Impiegà l'associ da tipu di schedariu, s'elli sò dispunibule" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Impiegà i parametri predefiniti di u &sistemu" +msgid "U&se system defaults for current language" +msgstr "Impiegà i parametri predefiniti di u &sistema per a lingua currente" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "UTILIZATORE@OSPITE" -#: ../../locales/../src/engine/proxy.cpp:364 -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Codice d'errore micca affettatu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Unità :" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1161 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Scunnisciutu" @@ -8051,7 +8185,7 @@ "Tipu di proxy FTP scunnisciutu, impussibule d'ingenereghjà una sequenza " "d'identificazione." -#: ../../locales/../src/engine/proxy.cpp:412 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versione di protoccollu SOCKS scunnisciuta : %d" @@ -8060,20 +8194,11 @@ msgid "Unknown certificate" msgstr "Certificatu scunnisciutu" -#: ../../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 "" -"Sbagliu scunnisciutu à l'apertura di u schedariu. Assicuratevvi chì u " -"schedariu sia accessibule è sia un ducumentu XML leghjittimu." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Chjave di l'ospite scunnisciuta" -#: ../../locales/../src/engine/proxy.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8082,15 +8207,15 @@ "Versione di protoccollu SOCKS di neguziazione d'autenticazione Utilizatore / " "Parolla d'intrata scunnisciuta : %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:420 +#: ../../locales/../src/interface/xmlfunctions.cpp:304 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:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8098,7 +8223,7 @@ "Tantu chì sti prublemi ùn sò micca curretti, u modu FTP attivu ùn " "funziuneghja micca è u modu passivu deve esse impiegatu." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -8106,15 +8231,15 @@ "Tantu chì stu prublemu ùn hè micca currettu, u modu FTP attivu ùn " "funziuneghja micca è u modu passivu deve esse impiegatu." -#: ../../locales/../src/engine/tlssocket.cpp:1017 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Tipu di certificatu micca suppurtatu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Ridirezzione micca suppurtata" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "Incaricà è compie a mudificazione" @@ -8123,24 +8248,24 @@ msgid "Updates" msgstr "Installà a nova versione di FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Incaricà" -#: ../../locales/../src/interface/edithandler.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "Incaricamentu fiascu" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Limitazione d'incaricamentu : %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Limitazione d'incaricamentu : alcuna" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Incaricà u cartulare selezziunatu" @@ -8148,31 +8273,31 @@ msgid "Upload selected files and directories" msgstr "Incaricà i schedarii è i cartulari selezziunati" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "Incaricà stu schedariu mudificatu ver di u servu ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "Incaricà stu schedariu ver di u servu ?" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1152 -#: ../../locales/../src/interface/edithandler.cpp:1317 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "Incaricamentu in corsu" -#: ../../locales/../src/interface/edithandler.cpp:1121 -#: ../../locales/../src/interface/edithandler.cpp:1319 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" -msgstr "Incaricamentu in corsu è in aspettanza di ritiru" +msgstr "Incaricamentu in corsu è in attesa di ritiru" -#: ../../locales/../src/interface/edithandler.cpp:1155 -#: ../../locales/../src/interface/edithandler.cpp:1321 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" msgstr "Incaricamentu è abbandonu di a mudificazione" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Impiegà un gruppu persunalizatu di &caratteri" @@ -8180,41 +8305,41 @@ msgid "Use &custom editor:" msgstr "Impiegà l'editore persunalizatu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Impiegà u sfugliendu &sincrunizatu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 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." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "Impiegà l'azzione predefinita" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 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:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Impiegà u servu chì hè dighjà cunnettu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Impiegà u servu da u Ghjestiunariu di Siti" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Impiegà i parametri pre&definiti di u sistemu" +msgid "Use system &defaults for current language" +msgstr "Impiegà i parametri pre&definiti di u sistema per a lingua currente" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8251,17 +8376,12 @@ msgid "User:" msgstr "Utilizatore :" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "U nome d'utilizatore ùn pò esse una seria di sbalarghi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326 -#, c-format -msgid "Using proxy %s" -msgstr "Impiegu di u proxy %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8270,29 +8390,25 @@ #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" -msgstr "Valevule da :" +msgstr "Accettevule da :" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" -msgstr "Valevule fine à :" +msgstr "Accettevule fine à :" #: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" msgstr "Messaghji ditagliati di u ghjurnale di wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Verificazione di u certificatu in corsu..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Versione :" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Assai altu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "" "L'ozzione d'affissà i schedarii piattati hè attiva, ma ùn hè micca " @@ -8302,7 +8418,7 @@ msgid "View/Edit" msgstr "Affissu / Mudificà" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Culonne videvule" @@ -8310,58 +8426,27 @@ msgid "W&rite" msgstr "Sc&rive" -#: ../../locales/../src/interface/QueueView.cpp:1677 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" -msgstr "In aspettanza" +msgstr "In attesa" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" -msgstr "In aspettanza d'una cunnessione per u sfugliendu" +msgstr "In attesa d'una cunnessione per u sfugliendu" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" -msgstr "In aspettanza di a parolla d'intrata" +msgstr "In attesa di a parolla d'intrata" #: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Waiting for transfer to be cancelled" -msgstr "In aspettanza d'abbandunà u trasferimentu" +msgstr "In attesa d'abbandunà u trasferimentu" -#: ../../locales/../src/engine/engineprivate.cpp:226 +#: ../../locales/../src/engine/engineprivate.cpp:229 msgid "Waiting to retry..." -msgstr "In aspettanza nanzu à un altra prova…" - -#: ../../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 "" -"Avertimentu !\n" -"\n" -"Un sbagliu in Windows pò causà prublemi cù FileZilla\n" -"\n" -"Stu sbagliu ghjunghje s'è voi avete :\n" -"- Windows Server 2003 o XP 64\n" -"- u parafocu Windows Firewall attivu\n" -"- u serviziu Application Layer Gateway attivu\n" -"Andate puru nantu à http://support.microsoft.com/kb/931130 per avè più di " -"ditaglii.\n" -"\n" -"Ci vole à disattivà, sia Windows Firewall, sia u serviziu Application Layer " -"Gateway,\n" -"osinnò FileZilla ùn si pianterà micca bè cù trasferimenti maiò." +msgstr "In attesa nanzu à un altra prova…" -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "" "Avertimentu, i dati di cunnessione d'un indirizzu IP incurrettu sò ignurati." @@ -8382,15 +8467,15 @@ "\n" "Site sicuru di vulè include ste versioni quantunque ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Avertimentu : Callaghja di sicurità pussibule !" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Benvenutu in FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Cosa hè di novu ?" @@ -8398,7 +8483,7 @@ msgid "What's new:" msgstr "Cio chì hè novu :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../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." @@ -8425,7 +8510,7 @@ msgid "Widescreen" msgstr "Screnu largu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "Vulete chì FileZilla s'arricordi di e parolle d'intrata ?" @@ -8433,20 +8518,20 @@ msgid "Wr&ite" msgstr "Scr&ive" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Indirizzu IP esternu incurrettu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Fine di linea gattive" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Iè" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8458,7 +8543,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Impiegate l'ultima versione di FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 msgid "You can always open this dialog again through the help menu." msgstr "Ghjè sempre pussibule d'apre stu dialogu per via à l'Aiutu." @@ -8490,20 +8575,20 @@ "You cannot replace an invalid character with another invalid character. " "Please enter a character that is allowed in filenames." msgstr "" -"Ùn hè micca pussibule di rimpiazzà un caratteru micca leghjittimu cù un " +"Ùn hè micca pussibule di rimpiazzà un caratteru micca accettevule cù un " "altru. Ci vole à impiegà un caratteru permessu in i nomi di schedarii." -#: ../../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 "" "Ùn avete micca scrittu un novu nome per u schedariu. Vulete rimpiazzallu ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "Avete selezziunatu al menu una leia simbulica." -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/search.cpp:700 +#: ../../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?" @@ -8511,7 +8596,7 @@ "Avete selezziunatu più di 10 schedarii per mudificalli, site sicuru di vulè " "continuà ?" -#: ../../locales/../src/interface/LocalListView.cpp:1677 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8519,35 +8604,39 @@ "Avete selezziunatu più di 10 schedarii o cartulari per aprelli, site sicuru " "di vulè continuà ?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Ci vole à entre un nome d'ospite." -#: ../../locales/../src/interface/search.cpp:493 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +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 msgid "You have to enter a local directory." msgstr "Ci vole à entre un cartulare lucale." -#: ../../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 "Ci vole à entre un indirizzu IP leghjittimu." +#: ../../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 "Ci vole à scrive un indirizzu IPv4 accettevule." -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:529 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:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "Ci vole à entre un nome di contu" -#: ../../locales/../src/interface/manual_transfer.cpp:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:480 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "You have to specify a user name" msgstr "Ci vole à entre un nome d'utilizatore" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8563,7 +8652,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:1506 +#: ../../locales/../src/interface/edithandler.cpp:1472 msgid "You need to enter a properly quoted command." msgstr "Ci vole à entre una cummanda leghjittima trà virgulette." @@ -8576,17 +8665,17 @@ msgid "You need to enter a proxy port in the range from 1 to 65535" msgstr "Ci vole à entre un numeru di portu di proxy sceltu trà 1 è 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: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 "" "Ci vole à entre almenu un passeghju, chì l'indette viote ùn sò micca " "suppurtate." -#: ../../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: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." @@ -8594,7 +8683,7 @@ "Ci vole à entre dui passeghji, lucale è alluntanatu, per permette u " "sfugliendu sincrunizatu per st'indetta." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1065 +#: ../../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." @@ -8602,23 +8691,23 @@ "Ci vole à entre dui passeghji, lucale è alluntanatu, per permette u " "sfugliendu sincrunizatu per stu situ." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Ci vole à indicà un schedariu lucale." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Ci vole à indicà un schedariu alluntanatu." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Ci vole à indicà un passeghju alluntanatu." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Ci vole à indicà un servu." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8626,7 +8715,7 @@ "Ùn duveriate micca avè prublemi per cunnettavvi à d'altri servi, i " "trasferimenti di schedariu duverianu funziunà bè." -#: ../../locales/../src/interface/QueueView.cpp:3084 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "" "L'urdinatore hà da mettessi in veghja à menu di cliccà nantu à Abbandunà." @@ -8644,7 +8733,7 @@ msgstr "chì principia cù" #: ../../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 "ottetti" @@ -8652,7 +8741,7 @@ msgid "contains" msgstr "chì cuntene" -#: ../../locales/../src/interface/updater.cpp:280 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "personalizatu" @@ -8674,19 +8763,19 @@ msgid "equals" msgstr "chì hè uguale à" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "schedariu" -#: ../../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:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../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 " @@ -8696,15 +8785,15 @@ "Assicuratevvi chì fzputtyget.exe sia presente in u cartulare d'installazione " "di FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartene à una versione sfarente di FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1483 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp ùn hè micca statu lanciatu" -#: ../../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 ùn hà riturnatu alcunu certificatu" @@ -8760,10 +8849,11 @@ msgid "owner writeable" msgstr "scrittura da u pruprietariu" -#: ../../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: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 "scunnisciutu" @@ -8783,6 +8873,119 @@ msgid "wxWidgets:" msgstr "wxWidgets :" +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "I cambiamenti fatti in u Ghjestiunariu di Siti ùn ponu micca esse " +#~ "arregistrati osinnò ci vole à riparà i schedariu." + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "" +#~ "Ùn hè micca pussibule di paragunà i cartulari, chì ùn c'hè alcuna " +#~ "cunnessione à un servu." + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "&Sguassà tutti l'elementi di u Ghjestiunariu di Siti" + +#~ 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 " +#~ "pussibule avà" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "" +#~ "Telecaricà parechji cartulari senza relazione trà elli ùn hè micca " +#~ "pussibule avà" + +#~ msgid "Downloading search results" +#~ msgstr "Telecarichendu i risultati di a ricerca" + +#~ msgid "Operating system problem detected" +#~ msgstr "Un errore s'hè affacatu in u sistemu d'operazione" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "U ducumentu XML ùn hè micca formatu bè : %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 "" +#~ "U schedariu '%s' ùn si trova micca in una forma suppurtata da FileZilla.\n" +#~ "Di più, u schedariu hè pruttetu da una parolla d'intrata, cio ch'ùn hè " +#~ "ancu suppurtatu da FileZilla.\n" +#~ "Vulete trasfurmallu in una forma suppurtata è micca prutteta ?" + +#~ 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 "" +#~ "U schedariu '%s' hè pruttetu da una parolla d'intrata, cio ch'ùn hè ancu " +#~ "suppurtatu da FileZilla.\n" +#~ "Vulete trasfurmallu in un schedariu micca pruttetu ?" + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Sfarenza di i fusi orarii : Servu : %d seconde. Lucale : %d seconde. " +#~ "Sfarenza : %d seconde." + +#~ msgid "U&se system defaults" +#~ msgstr "Impiegà i parametri predefiniti di u &sistemu" + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Sbagliu scunnisciutu à l'apertura di u schedariu. Assicuratevvi chì u " +#~ "schedariu sia accessibule è sia un ducumentu XML leghjittimu." + +#~ msgid "Use system &defaults" +#~ msgstr "Impiegà i parametri pre&definiti di u sistemu" + +#~ msgid "Using proxy %s" +#~ msgstr "Impiegu di u 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 "" +#~ "Avertimentu !\n" +#~ "\n" +#~ "Un sbagliu in Windows pò causà prublemi cù FileZilla\n" +#~ "\n" +#~ "Stu sbagliu ghjunghje s'è voi avete :\n" +#~ "- Windows Server 2003 o XP 64\n" +#~ "- u parafocu Windows Firewall attivu\n" +#~ "- u serviziu Application Layer Gateway attivu\n" +#~ "Andate puru nantu à http://support.microsoft.com/kb/931130 per avè più di " +#~ "ditaglii.\n" +#~ "\n" +#~ "Ci vole à disattivà, sia Windows Firewall, sia u serviziu Application " +#~ "Layer Gateway,\n" +#~ "osinnò FileZilla ùn si pianterà micca bè cù trasferimenti maiò." + #~ msgid "&Crash" #~ msgstr "Prova di &cullisione" diff -Nru filezilla-3.14.1/locales/cs_CZ.po filezilla-3.15.0.2/locales/cs_CZ.po --- filezilla-3.14.1/locales/cs_CZ.po 2014-07-07 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/locales/cs_CZ.po 2016-02-05 08:54:46.000000000 +0000 @@ -1,7 +1,7 @@ # 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. +# Michal Molhanec , 2007, 2008, 2011, 2013, 2015. # Martin Ruzicka , 2011. # Ivan Masár , 2008. # Acci , 2008. @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-01 11:03+0100\n" -"PO-Revision-Date: 2013-11-11 18:21+0100\n" +"POT-Creation-Date: 2015-11-12 10:26+0100\n" +"PO-Revision-Date: 2015-10-17 14:54+0200\n" "Last-Translator: Michal Molhanec \n" "Language-Team: \n" "Language: cs_CZ\n" @@ -20,20 +20,22 @@ "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.5.7\n" +"X-Generator: Poedit 1.8.5\n" -#: ../../locales/../src/interface/statuslinectrl.cpp:65 -#: ../../locales/../src/interface/statuslinectrl.cpp:230 +#. @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 uplynulo" -#: ../../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:61 +#: ../../locales/../src/interface/statuslinectrl.cpp:206 msgid "%H:%M:%S left" msgstr "%H.%M:%S zbývá" -#: resources.h:800 -#, 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 - účet (pokud nepoužíváte tento typ přihlášení, budou řádky obsahující " "toto vynechány)" -#: ../../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" @@ -51,9 +53,9 @@ msgstr[1] "%d složky" msgstr[2] "%d složek" -#: ../../locales/../src/interface/RemoteListView.cpp:1721 -#: ../../locales/../src/interface/search.cpp:777 -#: ../../locales/../src/interface/search.cpp:1030 +#: ../../locales/../src/interface/RemoteListView.cpp:1390 +#: ../../locales/../src/interface/search.cpp:478 +#: ../../locales/../src/interface/search.cpp:764 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -61,11 +63,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:62 -#: ../../locales/../src/interface/filelist_statusbar.cpp:85 -#: ../../locales/../src/interface/RemoteListView.cpp:1720 -#: ../../locales/../src/interface/search.cpp:776 -#: ../../locales/../src/interface/search.cpp:1029 +#: ../../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 #, c-format msgid "%d file" msgid_plural "%d files" @@ -73,7 +75,7 @@ msgstr[1] "%d soubory" msgstr[2] "%d souborů" -#: ../../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" @@ -81,7 +83,7 @@ msgstr[1] "%d soubory. Celková velikost: %s" msgstr[2] "%d souborů. Celková velikost: %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" @@ -89,7 +91,7 @@ msgstr[1] "%d soubory. Celková velikost: Nejméně %s" msgstr[2] "%d souborů. Celková velikost: Nejméně %s" -#: ../../locales/../src/interface/QueueView.cpp:2938 +#: ../../locales/../src/interface/QueueView.cpp:2781 #, c-format msgid "%d files added to queue" msgstr "%d souborů přidáno do fronty" @@ -102,51 +104,67 @@ msgstr[1] "%d sekundy" msgstr[2] "%d sekund" -#: resources.h:797 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:501 msgid "%h - Host" msgstr "%h - hostitel" -#: resources.h:799 -#, no-c-format +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu složka" +msgstr[1] "%llu složky" +msgstr[2] "%llu složek" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu soubor" +msgstr[1] "%llu soubory" +msgstr[2] "%llu souborů" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:517 +#, c-format msgid "%p - Password" msgstr "%p - heslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:186 +#: ../../locales/../src/interface/statuslinectrl.cpp:161 #, c-format msgid "%s (%s/s)" msgstr "%s (%s/s)" -#: ../../locales/../src/interface/statuslinectrl.cpp:189 +#: ../../locales/../src/interface/statuslinectrl.cpp:164 #, 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 - Platnost certifikátu vypršela!" -#: ../../locales/../src/interface/verifycertdialog.cpp:23 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ještě neplatná!" -#: resources.h:801 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:532 +#, c-format msgid "%s - Proxy user" msgstr "%s - uživatelské jméno pro 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 a %s. Celková velikost: %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 a %s. Celková velikost: Nejméně %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:31 +#: ../../locales/../src/engine/sizeformatting_base.cpp:66 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -154,17 +172,7 @@ msgstr[1] "%s bajty" msgstr[2] "%s bajtů" -#: ../../locales/../src/interface/updatewizard.cpp:918 -#, c-format -msgid "%s bytes" -msgstr "%s bajtů" - -#: ../../locales/../src/interface/updatewizard.cpp:902 -#, c-format -msgid "%s bytes (%s/s)" -msgstr "%s bajtů (%s/s)" - -#: ../../locales/../src/interface/FileZilla.cpp:711 +#: ../../locales/../src/interface/FileZilla.cpp:595 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -179,7 +187,7 @@ "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:805 +#: ../../locales/../src/interface/FileZilla.cpp:680 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -196,153 +204,174 @@ "proměnné prostředí PATH.\n" "- Nastavte proměnnou prostředí FZ_FZSFTP na plnou cestu k souboru %s." -#: ../../locales/../src/interface/verifycertdialog.cpp:56 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s s %d bity" -#: resources.h:798 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:509 +#, c-format msgid "%u - Username" msgstr "%u - uživatelské jméno" -#: resources.h:802 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:540 msgid "%w - Proxy password" msgstr "%w - heslo pro proxy" -#: resources.h:573 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 +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 msgid "&About..." msgstr "&O aplikaci FileZilla..." -#: resources.h:96 resources.h:395 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2487 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:218 msgid "&Account:" msgstr "Ú&čet:" -#: resources.h:111 resources.h:702 resources.h:766 +#: ../../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 "&Aktivní" -#: resources.h:564 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." msgstr "&Přidat k oblíbeným položkám..." -#: resources.h:577 resources.h:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:245 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" msgstr "Přidat soubory do &fronty" -#: resources.h:810 -msgid "&Add keyfile..." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:645 +msgid "&Add key file..." msgstr "&Přidat soubor s klíčem..." -#: resources.h:652 resources.h:671 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" msgstr "Přidat do &fronty" -#: resources.h:105 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "N&astavit posun časové zóny serveru:" -#: resources.h:28 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." -msgstr "&Vždy důvěřovat certifikátu v budoucích relacích." +msgstr "&Vždy důvěřovat tomuto certifikátu v budoucích relacích." -#: resources.h:193 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:895 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" -#: resources.h:962 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "Vž&dy použít výchozí editor" -#: resources.h:438 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "Vždy použít výběr pro &nepřidružené typy souborů" -#: resources.h:75 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:190 msgid "&Always use this action" msgstr "Vž&dy provést tuto akci" -#: resources.h:778 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:341 msgid "&Ask your operating system for the external IP address" msgstr "&Zeptat se operačního systému na externí IP adresu" -#: resources.h:546 resources.h:682 resources.h:847 +#: ../../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 "&Automatická detekce" -#: resources.h:117 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 msgid "&Autodetect" msgstr "&Automatická detekce" -#: resources.h:548 resources.h:684 resources.h:849 +#: ../../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ární" -#: resources.h:922 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1621 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ů)" -#: resources.h:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:204 msgid "&Bookmarks" msgstr "&Oblíbené položky" -#: resources.h:102 resources.h:377 resources.h:414 resources.h:420 -#: resources.h:437 resources.h:455 resources.h:959 resources.h:985 +#: ../../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 "Pro&cházet..." -#: resources.h:837 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "Tolerance k vý&kyvům:" -#: resources.h:138 resources.h:141 resources.h:208 resources.h:499 -#: resources.h:506 resources.h:750 +#: ../../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 "&Storno" -#: resources.h:246 -msgid "&Check for beta versions of FileZilla" -msgstr "Kontrolovat i &betaverze aplikace FileZilla" - -#: resources.h:523 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." msgstr "&Vymazat důvěrné údaje..." -#: resources.h:623 +#: ../../locales/../src/interface/resources/xrc/update.xrc:28 +msgid "&Close" +msgstr "&Zavřít" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:377 msgid "&Close FileZilla" msgstr "&Ukončit aplikaci FileZilla" -#: resources.h:692 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Nastavit omezení rychlostí..." -#: resources.h:551 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:163 msgid "&Configure..." msgstr "&Nastavit..." -#: resources.h:123 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "Připo&jit" -#: resources.h:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:12 msgid "&Copy current connection to Site Manager..." msgstr "Přidat &aktuální připojení do Správce míst..." -#: resources.h:183 resources.h:632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 msgid "&Copy to clipboard" msgstr "Kopírovat do &schránky" -#: resources.h:637 -msgid "&Crash" -msgstr "&Spadnout" - -#: resources.h:585 resources.h:599 resources.h:654 resources.h:675 +#: ../../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 "Nová slož&ka" +msgstr "Vytvořit slož&ku" -#: resources.h:687 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "&Nová záložka" @@ -350,169 +379,198 @@ msgid "&Debug" msgstr "L&adění" -#: resources.h:993 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" msgstr "&Ladicí informace v protokolu zpráv:" -#: resources.h:955 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" msgstr "Výchozí &editor:" -#: resources.h:544 resources.h:615 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:135 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:349 msgid "&Default file exists action..." msgstr "Nastavit &výchozí chování, pokud soubor již existuje..." -#: resources.h:760 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:155 msgid "&Delay between failed login attempts:" msgstr "Interval mezi &neúspěšnými pokusy o přihlášení:" -#: resources.h:86 resources.h:213 resources.h:227 resources.h:427 -#: resources.h:588 resources.h:677 +#: ../../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 "O&dstranit" -#: resources.h:468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "O&dstranit symbolický odkaz" -#: resources.h:529 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" msgstr "&Porovnání složek" -#: resources.h:336 +#: ../../locales/../src/interface/state.cpp:893 +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 +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/resources/xrc/dialogs.xrc:1809 msgid "&Discard local file then download and edit file anew" msgstr "Z&rušit místní soubor a upravit znovu vzdálený" -#: resources.h:557 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" msgstr "&Odpojit" -#: resources.h:624 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:381 msgid "&Disconnect from server" msgstr "&Odpojit od serveru" -#: resources.h:898 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1404 msgid "&Display momentary transfer speed instead of average speed" msgstr "&Zobrazit okamžitou přenosovou rychlost místo průměrné" -#: resources.h:920 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "&Zobrazovat velikost v bajtech" -#: resources.h:504 -msgid "&Do not remember passwords" -msgstr "&Zapomínat hesla" +#: ../../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." -#: resources.h:783 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:389 msgid "&Don't use external IP address on local connections." msgstr "Nepoužívat externí IP adresu pro &místní připojení." -#: resources.h:942 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 msgid "&Double-click action on files:" msgstr "A&kce po dvojitém kliknutí na soubor:" -#: resources.h:592 resources.h:650 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:286 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "&Stáhnout" -#: resources.h:454 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Stáhnout do:" -#: resources.h:685 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "&Stáhnout..." -#: resources.h:268 resources.h:859 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "S&tahování:" -#: resources.h:521 resources.h:583 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:45 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:259 msgid "&Edit" msgstr "&Upravit" -#: resources.h:221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." msgstr "Up&ravit pravidla filtrů..." -#: resources.h:530 resources.h:550 resources.h:665 resources.h:691 +#: ../../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 "&Povolit" -#: resources.h:492 resources.h:832 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "P&ovolit kompresi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "P&ovolit omezení rychlostí" # Žádné znaky pro zkratku volné... -#: resources.h:121 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "Kódov&ání:" -#: resources.h:92 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:141 msgid "&Encryption:" msgstr "Š&ifrování:" -#: resources.h:631 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "&Zadat vlastní příkaz..." -#: resources.h:147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +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 msgid "&Execute" msgstr "&Spouštění" -#: resources.h:303 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "&Export Site Manager entries" msgstr "&Exportovat položky ze správce míst" -#: resources.h:516 resources.h:681 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:27 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." msgstr "&Exportovat..." -#: resources.h:788 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:426 msgid "&Fall back to active mode" msgstr "V&rátit se k aktivnímu režimu" -#: resources.h:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:5 msgid "&File" msgstr "&Soubor" -#: resources.h:662 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "Změnit &atributy souboru..." -#: resources.h:610 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:332 msgid "&File permissions..." msgstr "Op&rávnění souborů..." -#: resources.h:376 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Soubor:" -#: resources.h:231 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "P&odmínky filtru:" -#: resources.h:210 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Sady filtrů:" -#: resources.h:225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtry:" -#: ../../locales/../src/interface/updatewizard.cpp:30 -msgid "&Finish" -msgstr "&Dokončit" - -#: resources.h:328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" msgstr "&Dokončit úpravy a odstranit místní soubor" -#: resources.h:458 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -520,509 +578,558 @@ "Sloučit &vzdálené cesty, stáhnout všechny obsažené soubory přímo do cílové " "složky" -#: resources.h:469 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Následovat symbolický odkaz, odstranit obsah cílové složky" -#: resources.h:781 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:367 msgid "&Get external IP address from the following URL:" msgstr "Získat externí IP &adresu z následujícího URL:" -#: resources.h:571 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:226 msgid "&Getting help..." msgstr "&Získat pomoc..." -#: resources.h:408 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Globální" -#: resources.h:817 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "&HTTP/1.1 používající metodu CONNECT" -#: resources.h:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:216 msgid "&Help" msgstr "Nápo&věda" -#: resources.h:533 resources.h:668 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:87 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Skrýt stejné soubory" -#: resources.h:617 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:354 msgid "&Highest" msgstr "&Nejvyšší" -#: resources.h:776 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:305 msgid "&Highest available port:" msgstr "N&ejvyšší využitelný port:" -#: resources.h:89 resources.h:389 resources.h:740 +#: ../../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 "&Hostitel:" -#: resources.h:921 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1616 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)" msgstr "Binární předpony &IEC (např. 1 KiB = 1024 bajtů)" -#: resources.h:909 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1502 msgid "&ISO 8601 (example: 2007-09-15)" msgstr "&ISO 8601 (příklad: 2007-09-15)" -#: resources.h:517 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." msgstr "&Importovat..." -#: resources.h:964 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "Používat nastavení s&ystému" -#: resources.h:457 +#: ../../locales/../src/interface/resources/xrc/update.xrc:109 +msgid "&Install new version" +msgstr "&Instalovat novou verzi" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "Po&nechat strukturu vzdálené cesty relativní ke kořenu hledání" -#: resources.h:882 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "Soubor s k&líčem" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Rozložení panelů souborů a složek:" -#: resources.h:773 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:268 msgid "&Limit local ports used by FileZilla" msgstr "&Omezit místní porty, které může FileZilla používat" -#: resources.h:113 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "Ome&zit počet současných připojení" -#: resources.h:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Local directory tree" msgstr "&Místní strom složek" -#: resources.h:413 resources.h:419 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "&Místní složka:" -#: resources.h:983 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "&Protokolovat do souboru" -#: resources.h:93 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "Způso&b přihlašování:" -#: resources.h:392 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "Z&působ přihlašování:" -#: resources.h:620 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:366 msgid "&Low" msgstr "Ní&zká" -#: resources.h:565 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." msgstr "&Spravovat oblíbené položky..." -#: resources.h:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Manual transfer..." msgstr "&Ruční přenos..." -#: resources.h:114 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "Ma&ximální počet připojení:" -#: resources.h:758 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:137 msgid "&Maximum number of retries:" msgstr "&Maximální počet opakování:" -#: resources.h:538 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Message log" msgstr "Protoko&l zpráv" -#: resources.h:895 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "&Minimalizovat do oznamovací oblasti" -#: resources.h:411 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 +msgid "&Name sorting mode:" +msgstr "Způsob řazení &jmen:" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Název:" -#: resources.h:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:47 msgid "&Network configuration wizard..." msgstr "&Průvodce nastavením sítě..." -#: resources.h:226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Nový" -#: resources.h:82 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" msgstr "Nové &místo" -#: ../../locales/../src/interface/updatewizard.cpp:1058 +#: ../../locales/../src/interface/Mainfrm.cpp:1663 msgid "&New version available!" msgstr "&Nová verze je k dispozici!" -#: ../../locales/../src/interface/updatewizard.cpp:28 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Další >" -#: resources.h:330 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&Ne" -#: resources.h:791 resources.h:816 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:458 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:719 msgid "&None" msgstr "Žá&dná" -#: resources.h:619 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:362 msgid "&Normal" msgstr "No&rmální" -#: resources.h:156 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:507 msgid "&Numeric value:" msgstr "Číselná &hodnota:" -#: resources.h:124 resources.h:137 resources.h:429 +#: ../../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" -#: resources.h:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:473 msgid "&OPEN" msgstr "O&PEN" -#: resources.h:581 resources.h:673 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:255 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" msgstr "O&tevřít" -#: resources.h:68 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" msgstr "&Přepsat" -#: resources.h:112 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "Pas&ivní" -#: resources.h:135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:340 msgid "&Password:" msgstr "&Heslo:" -#: resources.h:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:393 msgid "&Play sound" msgstr "&Přehrát zvuk" -#: resources.h:90 resources.h:390 resources.h:744 +#: ../../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 "Po&rt:" -#: resources.h:888 -msgid "&Position of the message log:" -msgstr "&Pozice protokolu zpráv:" - -#: resources.h:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" msgstr "&Zachovávat časy u přenášených souborů" -#: resources.h:312 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "&Fronta" -#: resources.h:746 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" msgstr "R&ychlé připojení" -#: resources.h:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "&Quickconnect bar" msgstr "Panel &Rychlé připojení" -#: resources.h:145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "Historie &rychlých připojení" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "Č&tení" -#: resources.h:556 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:181 msgid "&Reconnect" msgstr "Znovu &připojit" -#: resources.h:527 resources.h:690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +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 msgid "&Refresh" msgstr "&Aktualizovat" -#: resources.h:136 -#, fuzzy +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 msgid "&Remember password until FileZilla is closed" -msgstr "&Zapamatovat si heslo pro tuto relaci" +msgstr "&Zapamatovat si heslo do ukončení aplikace FileZilla" -#: resources.h:503 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Pamatovat si hesla" -#: resources.h:415 resources.h:421 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Vzdálená složka:" -#: resources.h:379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "V&zdálená složka:" -#: resources.h:853 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" msgstr "&Odebrat" -#: resources.h:811 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:650 msgid "&Remove key" msgstr "&Odebrat klíč" -#: resources.h:614 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "&Remove selected" msgstr "&Odebrat vybrané" -#: resources.h:85 resources.h:228 resources.h:426 resources.h:590 -#: resources.h:606 resources.h:658 resources.h:679 +#: ../../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 "&Přejmenovat" -#: resources.h:212 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "&Přejmenovat..." -#: resources.h:335 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "&Znovu otevřít místní soubor" -#: resources.h:844 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "&Neplatné znaky nahradit znakem:" -#: resources.h:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:229 msgid "&Report a bug..." msgstr "Oznámit &chybu..." -#: resources.h:642 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" msgstr "Vše obnovit a &zařadit znovu do fronty" -#: resources.h:739 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" msgstr "&Restartovat průvodce" -#: resources.h:72 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 msgid "&Resume" msgstr "Navá&zat" # možná by mělo být "Navázat" nemohu to najít... -#: resources.h:625 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:385 msgid "&Run command..." msgstr "&Spustit příkaz..." -#: resources.h:753 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:76 msgid "&Run configuration wizard now..." msgstr "Sp&ustit průvodce nastavením sítě..." -#: resources.h:978 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." msgstr "Spustit &kontrolu aktualizací..." -#: resources.h:793 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:468 msgid "&SITE" msgstr "S&ITE" -#: resources.h:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:734 msgid "&SOCKS 5" msgstr "S&OCKS 5" -#: resources.h:211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "&Uložit jako..." -#: resources.h:443 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Hledat" -#: resources.h:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:190 msgid "&Search remote files..." msgstr "&Hledat vzdálené soubory..." -#: resources.h:81 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:18 msgid "&Select Entry:" msgstr "&Vybrat položku:" -#: resources.h:953 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" msgstr "Výběr &jazyka:" -#: resources.h:367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "&Vyberte sloupce, které chcete zobrazovat:" -#: resources.h:381 resources.h:554 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "S&erver" -#: resources.h:311 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "&Nastavení" -#: resources.h:524 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:54 msgid "&Settings..." msgstr "&Nastavení..." -#: resources.h:992 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "&Zobrazovat položku Ladění v hlavní nabídce" -#: resources.h:626 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 +msgid "&Show detailed log" +msgstr "Zobrazit &podrobný protokol" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:389 msgid "&Show message" msgstr "&Zobrazit zprávu" -#: resources.h:982 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" msgstr "&Zobrazovat časové údaje v protokolu zpráv" -#: resources.h:509 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +msgid "&Site Manager entries" +msgstr "Položky &správce míst" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Správce míst..." -#: resources.h:409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "Pl&atná jen pro určité místo" -#: resources.h:74 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 msgid "&Skip" msgstr "Přes&kočit" -#: resources.h:552 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:165 msgid "&Speed limits" msgstr "&Omezení rychlostí" -#: resources.h:460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Spustit přenos &okamžitě" -#: resources.h:887 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" msgstr "Z&aměnit místní a vzdálené panely" -#: resources.h:639 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "&TLS šifry" -#: ../../locales/../src/interface/netconfwizard.cpp:228 +#: ../../locales/../src/interface/netconfwizard.cpp:244 msgid "&Test" msgstr "&Test" -#: resources.h:901 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Téma:" -#: resources.h:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:127 msgid "&Transfer" msgstr "&Přenos" -#: resources.h:109 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "&Režim přenosu:" -#: resources.h:541 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Frontu přenosů" -#: resources.h:856 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "Rozpoznávat &tečkové soubory jako ASCII soubory" -#: resources.h:341 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "&Vrátit úpravy" -#: resources.h:206 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "&Aktualizovat klíč uložený v mezipaměti pro tohoto hostitele" -#: resources.h:575 resources.h:669 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:240 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Odeslat na server" -#: resources.h:278 resources.h:868 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Odesílání:" -#: resources.h:436 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "P&oužít vlastní program" -#: resources.h:104 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "Po&užít synchronizované procházení" -#: resources.h:957 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1911 msgid "&Use system's default editor for text files" msgstr "Po&užít výchozí systémový editor textových souborů" -#: resources.h:779 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:347 msgid "&Use the following IP address:" msgstr "&Použít tuto IP adresu:" -#: resources.h:787 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:420 msgid "&Use the server's external IP address instead" msgstr "Po&užít místo toho externí IP adresu serveru" -#: resources.h:924 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 msgid "&Use thousands separator" msgstr "&Použít oddělovač tisíců" -#: resources.h:94 resources.h:134 resources.h:393 +#: ../../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živatelské jméno:" -#: resources.h:742 +#: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 msgid "&Username:" msgstr "Uživatelské &jméno:" -#: ../../locales/../src/interface/updatewizard.cpp:1054 +#: ../../locales/../src/interface/Mainfrm.cpp:1657 #, c-format msgid "&Version %s" msgstr "&Verze %s" -#: resources.h:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:59 msgid "&View" msgstr "&Zobrazit" -#: resources.h:598 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:300 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Zobrazit/Upravit" -#: resources.h:963 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1968 msgid "&Watch locally edited files and prompt to upload modifications" msgstr "Sledovat &místně upravované soubory a vyzvat k odeslání změn" -#: resources.h:974 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" msgstr "Vy&hledávat:" -#: resources.h:146 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Write" msgstr "&Zápis" -#: resources.h:329 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "&Yes" msgstr "&Ano" -#: ../../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“ neexistuje nebo je nepřístupné." -#: ../../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“ není složka." -#: ../../locales/../src/interface/manual_transfer.cpp:445 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/manual_transfer.cpp:426 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 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:459 +#: ../../locales/../src/interface/manual_transfer.cpp:440 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1030,7 +1137,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:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1038,7 +1145,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:596 +#: ../../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 " @@ -1048,8 +1155,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: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)" @@ -1057,70 +1164,59 @@ msgstr[1] "(%d objekty filtrovány)" msgstr[2] "(%d objektů filtrováno)" -#: resources.h:828 resources.h:830 +#: ../../locales/../src/interface/update_dialog.cpp:254 +#, 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 msgid "(0 for no limit)" msgstr "(0 ... bez omezení)" -#: resources.h:759 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:149 msgid "(0-99)" msgstr "(0-99)" -#: resources.h:761 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:167 msgid "(0-999 seconds)" msgstr "(0-999 sekund)" -#: resources.h:826 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(1-10)" -#: resources.h:755 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, 0 pro vypnutí)" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:109 +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, 0 pro vypnutí)" -#: ../../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 "" +msgstr "(kompatibilita aplikace je nastavena na %d.%d)" -#: resources.h:917 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(příklad: %H.%M)" -#: resources.h:911 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(příklad: %Y-%m-%d)" -#: resources.h:494 resources.h:496 resources.h:834 resources.h:836 +#: ../../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 "(v %s/s)" -#: ../../locales/../src/interface/updatewizard.cpp:910 -msgid ", %H:%M:%S left" -msgstr ", %H.%M:%S zbývá" - -#: ../../locales/../src/interface/updatewizard.cpp:914 -msgid ", --:--:-- left" -msgstr ", --.--:-- zbývá" - -#: resources.h:727 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:295 msgid "-" msgstr "-" -#: resources.h:259 -msgid "- Broken router and/or firewall" -msgstr "- nefunkční router nebo brána firewall" - -#: resources.h:260 -msgid "- File corrupted on mirror" -msgstr "- poškozený soubor na zrcadle" - -#: resources.h:258 -msgid "- Malware on your system" -msgstr "- malware ve vašem systému" - -#: ../../locales/../src/interface/statuslinectrl.cpp:241 +#: ../../locales/../src/interface/statuslinectrl.cpp:209 msgid "--:--:-- left" msgstr "--.--:-- zbývá" @@ -1140,58 +1236,58 @@ msgid "-s cannot be used together with an FTP URL." msgstr "Přepínač -s nelze použít zároveň s FTP URL." -#: resources.h:994 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - Žádné" -#: resources.h:995 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - Upozornění" -#: resources.h:996 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - Informativní" -#: resources.h:997 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" msgstr "3 - Podrobné" -#: ../../locales/../src/interface/aboutdialog.cpp:158 -msgid "32 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:98 +msgid "32-bit system" msgstr "32bitový systém" -#: resources.h:998 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - Ladicí" -#: ../../locales/../src/interface/aboutdialog.cpp:156 -msgid "64 bit system" +#: ../../locales/../src/interface/aboutdialog.cpp:96 +msgid "64-bit system" msgstr "64bitový systém" -#: ../../locales/../src/interface/updatewizard.cpp:29 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Zpět" -#: resources.h:566 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:215 msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:108 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 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." -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159 +#: ../../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:117 -#: ../../locales/../src/interface/state.cpp:827 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:742 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." -#: resources.h:699 +#: ../../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 " @@ -1201,29 +1297,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." -#: resources.h:317 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." msgstr "Dříve otevřený soubor byl změněn." -#: ../../locales/../src/interface/LocalListView.cpp:2066 -#, c-format -msgid "" -"A file with that name is already being edited. Do you want to reopen '%s'?" -msgstr "" -"Soubor s tímto názvem je již upravován. Chcete znovu otevřít soubor „%s“?" - -#: ../../locales/../src/interface/LocalListView.cpp:2062 -#: ../../locales/../src/interface/RemoteListView.cpp:2705 +#: ../../locales/../src/interface/edithandler.cpp:1644 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/RemoteListView.cpp:2710 +#: ../../locales/../src/interface/edithandler.cpp:1648 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:690 +#: ../../locales/../src/interface/FileZilla.cpp:574 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1237,11 +1325,11 @@ "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." -#: resources.h:248 -msgid "A newer version of FileZilla is available:" -msgstr "Novější verze aplikace FileZilla je k dispozici:" +#: ../../locales/../src/interface/resources/xrc/update.xrc:50 +msgid "A new version of FileZilla is available:" +msgstr "Nová verze aplikace FileZilla je k dispozici:" -#: ../../locales/../src/interface/Mainfrm.cpp:679 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -1250,7 +1338,7 @@ "skrývají soubory před uživatelem. Použijte toto nastavení pro vynucení " "zobrazení všech souborů serveru." -#: resources.h:771 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:245 msgid "" "A proper server does not require this. Contact the server administrator if " "you need this." @@ -1258,7 +1346,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:284 +#: ../../locales/../src/interface/state.cpp:257 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1266,83 +1354,81 @@ "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?" -#: resources.h:547 resources.h:683 resources.h:848 +#: ../../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 "AS&CII" -#: resources.h:852 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1110 msgid "A&dd" msgstr "&Přidat" -#: resources.h:879 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" msgstr "Povo&lit navazování ASCII souborů" -#: ../../locales/../src/interface/fileexistsdlg.cpp:114 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" msgstr "Platí jen při &stahování" -#: ../../locales/../src/interface/fileexistsdlg.cpp:160 +#: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" msgstr "Platí jen při odesílání na &server" -#: resources.h:159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 msgid "A&pply to all files and directories" msgstr "Použít pro &všechny soubory a složky" -#: resources.h:649 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "A&utomaticky odebírat úspěšné přenosy" -#: resources.h:400 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" -#: resources.h:490 -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" - -#: resources.h:164 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:582 msgid "About FileZilla" msgstr "O aplikaci FileZilla" -#: resources.h:889 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Nad seznamem souborů" -#: ../../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: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 msgid "Account" msgstr "Účet" -#: resources.h:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:375 msgid "Action after queue &completion" msgstr "Či&nnost po zpracování fronty" -#: resources.h:340 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "Akce s vybraným souborem:" -#: resources.h:334 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Provést:" -#: resources.h:67 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:129 msgid "Action:" msgstr "Akce:" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:118 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:94 msgid "Active mode" msgstr "Aktivní režim" -#: ../../locales/../src/interface/netconfwizard.cpp:605 +#: ../../locales/../src/interface/netconfwizard.cpp:621 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1350,7 +1436,7 @@ "Test aktivního režimu FTP se nezdařil. Aplikace FileZilla nezná správnou " "externí IP adresu." -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:608 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." @@ -1358,7 +1444,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:580 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1367,39 +1453,38 @@ "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." -#: resources.h:784 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:398 msgid "Active mode IP" msgstr "IP adresa pro aktivní režim" -#: resources.h:461 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Pouze přidat soubory do &fronty" -#: resources.h:653 resources.h:672 +#: ../../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 "Přidat vybranou složku do fronty přenosů" -#: resources.h:578 resources.h:595 +#: ../../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 "Přidat vybrané soubory a složky do fronty přenosů" -#: resources.h:944 resources.h:950 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" msgstr "Přidat do fronty" -#: ../../locales/../src/engine/proxy.cpp:447 +#: ../../locales/../src/engine/proxy.cpp:505 msgid "Address type not supported" msgstr "Tento typ adresy není podporován" -#: resources.h:98 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Pokročilé" -#: resources.h:245 -msgid "Advanced options:" -msgstr "Pokročilé možnosti:" - -#: resources.h:977 +#: ../../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 " @@ -1413,19 +1498,23 @@ "mohou dokonce i poškodit váš systém. Použití betaverzí a nočních sestavení " "je na vaše vlastní riziko." -#: resources.h:349 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 +msgid "Al&ways perform this action" +msgstr "Vž&dy provést tuto akci" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Algoritmus:" -#: ../../locales/../src/interface/QueueView.cpp:3127 +#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "All files have been successfully transferred" msgstr "Všechny soubory byly úspěšně přeneseny" -#: resources.h:728 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:308 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:3123 +#: ../../locales/../src/interface/QueueView.cpp:2946 #, 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,19 +1522,26 @@ 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." -#: resources.h:767 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:213 msgid "Allow &fall back to other transfer mode on failure" msgstr "Povolit &návrat k druhému režimu přenosu při chybě" -#: resources.h:703 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:88 msgid "Allow fallback to other transfer mode on failure" msgstr "Povolit návrat k druhému režimu přenosu při chybě" -#: resources.h:487 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Připojení je již vytvořeno" -#: resources.h:812 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 +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 msgid "" "Alternatively you can use the Pageant tool from PuTTY to manage your keys, " "FileZilla does recognize Pageant." @@ -1453,7 +1549,7 @@ "Jinak můžete použít nástroj Pageant z Putty pro správu svých klíčů, aplikace " "FileZilla dokáže Pageant rozpoznat." -#: resources.h:813 +#: ../../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." @@ -1461,15 +1557,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/updatewizard.cpp:1118 +#: ../../locales/../src/interface/resources/xrc/update.xrc:129 msgid "" -"Alternatively, visit https://filezilla-project.org/ to download the most " -"recent version." -msgstr "" -"Nebo navštivte https://filezilla-project.org/ pro získání nejnovější verze " -"aplikace FileZilla." +"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:2046 +#: ../../locales/../src/interface/QueueView.cpp:1911 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1478,7 +1572,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:1945 +#: ../../locales/../src/interface/QueueView.cpp:1821 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1487,7 +1581,7 @@ "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:1960 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1495,96 +1589,96 @@ "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: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:1538 +#: ../../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 msgid "Anonymous" msgstr "Anonymní" -#: ../../locales/../src/interface/state.cpp:1095 +#: ../../locales/../src/interface/state.cpp:943 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:785 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 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/sitemanager_dialog.cpp:730 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Změny provedené ve správci míst nebudou uloženy, dokud soubor neopravíte." - -#: ../../locales/../src/interface/filter.cpp:209 +#: ../../locales/../src/interface/filter.cpp:212 msgid "Any changes made to the filters could not be saved." msgstr "Žádné změny filtrů nelze uložit." -#: ../../locales/../src/interface/filter.cpp:1033 +#: ../../locales/../src/interface/filter.cpp:969 msgid "Any changes made to the filters will not be saved." msgstr "Žádné změny filtrů nelze uložit." -#: resources.h:161 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 msgid "App&ly to directories only" msgstr "Použít &jen pro složky" -#: resources.h:224 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Použít" -#: resources.h:76 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" msgstr "Platí jen na &aktuální frontu" -#: resources.h:160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" msgstr "Použít jen pro sou&bory" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:105 -#: ../../locales/../src/interface/updatewizard.cpp:330 msgid "Archive" msgstr "Archivovat" -#: resources.h:891 +#: ../../locales/../src/engine/socket.cpp:1095 +msgid "Argument buffer overflow" +msgstr "Přetečení vyrovnávací paměti argumentu" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 msgid "As tab in the transfer queue pane" msgstr "Jako záložka v panelu fronty přenosů" -#: resources.h:270 resources.h:280 resources.h:860 resources.h:869 +#: ../../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 "Zeptat se" #: ../../locales/../src/engine/server.cpp:856 -#: ../../locales/../src/engine/server.cpp:875 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/interface/manual_transfer.cpp:181 msgid "Ask for password" msgstr "Zeptat se na heslo" -#: resources.h:724 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." msgstr "Zeptat se operačního systému na port." -#: resources.h:714 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:173 msgid "Ask your operating system for the external IP address" msgstr "Zeptat se operačního systému na externí IP adresu" -#: resources.h:482 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Položit otázku v diskuzním fóru aplikace 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 "Přidružený program nebyl nalezen:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" msgstr "Nejméně jedna podmínka filtru není kompletní" -#: resources.h:733 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." msgstr "Všechny informace jsou již získány." @@ -1592,91 +1686,95 @@ msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 msgid "Authentication failed." msgstr "Ověření selhalo." -#: resources.h:902 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Autor:" -#: resources.h:397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Automatická detekce" -#: resources.h:850 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" msgstr "Automatické rozpoznávání typů souborů" -#: resources.h:906 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" msgstr "Dostupné velikosti" -#: ../../locales/../src/engine/sizeformatting_base.cpp:129 -#: ../../locales/../src/engine/sizeformatting_base.cpp:188 +#: ../../locales/../src/engine/sizeformatting_base.cpp:154 +#: ../../locales/../src/engine/sizeformatting_base.cpp:213 msgid "B " msgstr "B " -#: resources.h:100 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 msgid "B&ypass proxy" msgstr "Obcházet pro&xy" -#: resources.h:478 +#: ../../locales/../src/engine/socket.cpp:1059 +msgid "Bad file descriptor" +msgstr "Neplatný popisovač souboru" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Základní pokyny k použití" -#: resources.h:893 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Chování" -#: ../../locales/../src/interface/edithandler.cpp:1268 -#: ../../locales/../src/interface/edithandler.cpp:1296 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "Upravován" -#: resources.h:636 -msgid "Benchmark string coalescer" -msgstr "Srovnávací test slučovače řetězců" - -#: ../../locales/../src/engine/tlssocket.cpp:1086 +#: ../../locales/../src/engine/tlssocket.cpp:1111 msgid "Beware! Certificate has been revoked" msgstr "Pozor! Certifikát byl odvolán" -#: resources.h:401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Binární" -#: resources.h:886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Tabule" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:272 -#: ../../locales/../src/interface/menu_bar.cpp:313 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:395 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 msgid "Bookmark" msgstr "Položka" -#: resources.h:424 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Položka:" -#: resources.h:423 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Oblíbené položky" -#: resources.h:172 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Procházet..." + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Datum sestavení:" -#: resources.h:169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:646 msgid "Build information" msgstr "Informace o sestavení" -#: ../../locales/../src/interface/verifycertdialog.cpp:181 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Druh činnosti:" -#: resources.h:774 +#: ../../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, " @@ -1687,77 +1785,98 @@ "používala pouze omezený rozsah portů, zadejte rozsah portů, který se má " "používat." -#: resources.h:555 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" msgstr "&Zrušit aktuální operaci" -#: resources.h:247 -msgid "C&heck for nightly builds of FileZilla" -msgstr "K&ontrolovat noční (vývojové) sestavení aplikace FileZilla" - -#: resources.h:633 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" msgstr "&Vymazat vše" -#: resources.h:608 resources.h:660 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:328 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "Kopírovat &URL do schránky" -#: resources.h:910 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "Vl&astní" -#: resources.h:965 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "Vlas&tní typy souborů:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "Funkce procesoru:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 msgid "Calculating timezone offset of server..." msgstr "Počítá se posun časové zóny serveru..." -#: ../../locales/../src/engine/transfersocket.cpp:743 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Nelze číst ze souboru" -#: ../../locales/../src/engine/transfersocket.cpp:722 -#: ../../locales/../src/engine/transfersocket.cpp:796 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:716 msgid "Can't write data to file." msgstr "Nelze zapsat data do souboru." -#: ../../locales/../src/engine/transfersocket.cpp:720 -#: ../../locales/../src/engine/transfersocket.cpp:794 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:718 #, c-format msgid "Can't write data to file: %s" msgstr "Nelze zapsat data do souboru: %s" -#: resources.h:30 resources.h:79 resources.h:125 resources.h:163 -#: resources.h:195 resources.h:223 resources.h:240 resources.h:291 -#: resources.h:300 resources.h:307 resources.h:315 resources.h:338 -#: resources.h:371 resources.h:404 resources.h:418 resources.h:430 -#: resources.h:440 resources.h:463 resources.h:472 resources.h:491 +#: ../../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 "Storno" -#: resources.h:1017 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 msgid "Cancel current operation" msgstr "Zruší aktuální operaci" -#: resources.h:1018 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancels the current operation" msgstr "Zruší aktuální operaci" -#: ../../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 "" "Nelze přistoupit k „%s“, není vloženo médium nebo není připravena jednotka." -#: ../../locales/../src/interface/Mainfrm.cpp:566 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Cannot add server to Site Manager" msgstr "Nelze přidat server do Správce míst" -#: ../../locales/../src/interface/context_control.cpp:348 +#: ../../locales/../src/engine/socket.cpp:1112 +msgid "Cannot assign requested address" +msgstr "Nemohu přiřadit požadovanou adresu" + +#: ../../locales/../src/interface/context_control.cpp:349 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1765,7 +1884,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:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1773,216 +1892,238 @@ "Nelze porovnávat obsahy složek, jsou povoleny odlišné filtry pro místní a " "vzdálené složky" -#: ../../locales/../src/interface/RemoteListView.cpp:2809 -msgid "Cannot compare directories, not connected to a server." -msgstr "Nelze porovnat složky, nejste připojeni k serveru." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Nelze vytvořit nový filtr" -#: ../../locales/../src/interface/LocalListView.cpp:2044 -#: ../../locales/../src/interface/LocalListView.cpp:2175 -#: ../../locales/../src/interface/RemoteListView.cpp:2639 -#: ../../locales/../src/interface/RemoteListView.cpp:2685 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/search.cpp:712 msgid "Cannot edit file" msgstr "Nelze upravit soubor" -#: ../../locales/../src/interface/LocalListView.cpp:1960 +#: ../../locales/../src/interface/LocalListView.cpp:1582 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:1971 +#: ../../locales/../src/interface/LocalListView.cpp:1591 msgid "Cannot edit file, remote path unknown." msgstr "Nelze upravit soubor, neznámá vzdálená cesta." -#: ../../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." msgstr "Nelze navázat FTP připojení s SFTP serverem. Vyberte správný 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 "Nelze načíst panel rychlého připojení ze zdrojového souboru" -#: ../../locales/../src/interface/import.cpp:38 -msgid "Cannot load file, not a valid XML file." -msgstr "Soubor neobsahuje platné XML, nelze ho načíst." - -#: ../../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 "Nelze načíst soubor s klíčem" -#: ../../locales/../src/interface/Mainfrm.cpp:1091 +#: ../../locales/../src/interface/Mainfrm.cpp:993 msgid "Cannot load toolbar from resource file" msgstr "Nelze načíst panel nástrojů ze zdrojového souboru" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:444 msgid "Cannot remember password" msgstr "Heslo si nelze zapamatovat" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Cannot rename entry" msgstr "Nelze přejmenovat položku" -#: ../../locales/../src/interface/RemoteListView.cpp:1921 +#: ../../locales/../src/interface/RemoteListView.cpp:1589 msgid "Cannot rename file" msgstr "Nelze přejmenovat soubor" -#: ../../locales/../src/interface/filter.cpp:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/engine/proxy.cpp:148 +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 msgid "Cannot save filterset" msgstr "Nelze uložit sadu filtrů" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:303 msgid "Cannot select filter" msgstr "Nelze vybrat filtr" -#: ../../locales/../src/interface/edithandler.cpp:1646 -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/edithandler.cpp:1690 +#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Nelze nastavit přidružení" -#: ../../locales/../src/interface/edithandler.cpp:1227 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Dialog nelze zobrazit" -#: ../../locales/../src/interface/LocalListView.cpp:2062 -#: ../../locales/../src/interface/RemoteListView.cpp:2705 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Nelze zobrazit nebo upravit vybraný soubor" -#: resources.h:294 -msgid "Categories" -msgstr "Kategorie" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +msgid "Case insensitive" +msgstr "Nerozlišovat velikost písmen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 +msgid "Case insensitive (default)" +msgstr "Nerozlišovat velikost písmen (výchozí)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 +msgid "Case sensitive" +msgstr "Rozlišovat velikost písmen" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 +msgid "Case sensitive (default)" +msgstr "Rozlišovat velikost písmen (výchozí)" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "Kategorie k vymazání" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "Certifikát a údaje o relaci nejsou zatím dostupné." -#: resources.h:31 -msgid "Certificate details" -msgstr "Podrobnosti certifikátu" - -#: resources.h:3 resources.h:32 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 msgid "Certificate in chain:" msgstr "Certifikát v řetězci:" -#: resources.h:14 resources.h:43 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:144 msgid "Certificate issuer" msgstr "Vydavatel certifikátu" -#: resources.h:133 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" msgstr "Výzva:" -#: resources.h:142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 msgid "Change file attributes" msgstr "Změnit atributy souboru" -#: resources.h:611 resources.h:663 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:333 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Změnit oprávnění souboru." -#: resources.h:990 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2195 msgid "Changing logfile settings requires restart of FileZilla." msgstr "Změna nastavení protokolování vyžaduje restart aplikace FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:690 +#: ../../locales/../src/interface/FileZilla.cpp:574 msgid "Character encoding issue" msgstr "Problém s kódováním znaku" -#: resources.h:115 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Znaková sada" -#: resources.h:568 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:218 msgid "Check for &updates..." -msgstr "&Kontrolovat aktualizace..." +msgstr "Z&kontrolovat aktualizace..." -#: resources.h:969 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" -msgstr "V&yhledávat aktualizace automaticky:" +msgstr "Kontrolovat aktualizace automatick&y:" -#: resources.h:569 +#: ../../locales/../src/interface/resources/xrc/update.xrc:4 +msgid "Check for Updates" +msgstr "Zkontrolovat aktualizace" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "Check for newer versions of FileZilla" msgstr "Kontrolovat novější verze aplikace FileZilla" -#: ../../locales/../src/interface/updatewizard.cpp:171 -msgid "Check for updates" -msgstr "Zkontrolovat aktualizace" - -#: ../../locales/../src/interface/Mainfrm.cpp:1819 +#: ../../locales/../src/interface/update_dialog.cpp:57 msgid "Check for updates failed" msgstr "Kontrola aktualizací se nezdařila" -#: ../../locales/../src/interface/netconfwizard.cpp:765 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +msgid "" +"Check your login credentials. The entered password starts or ends with a " +"space character." +msgstr "" +"Zkontrolujte si své přihlašovací údaje. Zadané heslo začíná nebo končí " +"mezerou." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +msgid "" +"Check your login credentials. The entered username starts or ends with a " +"space character." +msgstr "" +"Zkontrolujte si své přihlašovací údaje. Zadané uživatelské jméno začíná nebo " +"končí mezerou." + +#: ../../locales/../src/interface/netconfwizard.cpp:771 msgid "Checking for correct external IP address" msgstr "Kontrola správné externí IP adresy" -#: resources.h:243 -msgid "Checking for updates" -msgstr "Probíhá kontrola aktualizací" - -#: ../../locales/../src/interface/updatewizard.cpp:1261 -msgid "Checksum mismatch of downloaded file." -msgstr "Kontrolní součet staženého souboru neodpovídá." +#: ../../locales/../src/interface/resources/xrc/update.xrc:162 +msgid "Checking for updates..." +msgstr "Probíhá kontrola aktualizací…" + +#: ../../locales/../src/interface/updater.cpp:715 +#, c-format +msgid "Checksum match on file %s\n" +msgstr "Kontrolní součet souboru %s souhlasí\n" + +#: ../../locales/../src/interface/updater.cpp:711 +#, 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 +msgid "Choose a key file" +msgstr "Vyberte soubor s klíčem" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 msgid "Choose the default local directory" msgstr "Vyberte výchozí místní složku" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:130 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:378 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:124 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 msgid "Choose the local directory" msgstr "Vyberte místní složku" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 msgid "Chunk data improperly terminated" msgstr "Části dat chybně ukončeny" -#: resources.h:23 resources.h:52 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:210 msgid "Cipher:" msgstr "Šifra:" -#: resources.h:514 resources.h:688 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:21 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "&Zavřít záložku" -#: resources.h:883 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klasické" -#: resources.h:297 -msgid "Clear &Site Manager entries" -msgstr "Vymazat položky ve &správci míst" - -#: resources.h:634 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" msgstr "&Vymazat mezipaměť rozvržení dialogů" -#: resources.h:295 -msgid "Clear &quickconnect history" -msgstr "Vymazat historii &rychlých připojení" - -#: resources.h:296 -msgid "Clear &reconnect information" -msgstr "Vymazat informace pro &znovuspojení" - -#: resources.h:298 -msgid "Clear &transfer queue" -msgstr "Vymazat &frontu přenosů" - #: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Clear history" msgstr "Vymazat historii" -#: resources.h:292 ../../locales/../src/interface/clearprivatedata.cpp:34 +#: ../../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 @@ -1994,32 +2135,25 @@ msgid "Clear quickconnect bar" msgstr "Vymazat panel rychlého připojení" -#: resources.h:635 -msgid "Clear string coalescer" -msgstr "Vyčistit slučovač řetězců" - -#: ../../locales/../src/interface/netconfwizard.cpp:571 +#: ../../locales/../src/interface/netconfwizard.cpp:587 msgid "Click on Finish to save your configuration." msgstr "Klikněte na tlačítko Dokončit pro uložení nastavení." -#: ../../locales/../src/interface/updatewizard.cpp:1117 -msgid "Click on next to download the new version." -msgstr "Pro stažení nové verze klikněte na Další." - -#: resources.h:358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "Klient na server MAC:" -#: resources.h:356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "Šifra uživatele na server:" -#: resources.h:689 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" msgstr "Zavřít &všechny ostatní záložky" -#: resources.h:520 ../../locales/../src/interface/Mainfrm.cpp:1236 -#: ../../locales/../src/interface/Mainfrm.cpp:1259 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:40 +#: ../../locales/../src/interface/Mainfrm.cpp:1134 +#: ../../locales/../src/interface/Mainfrm.cpp:1155 msgid "Close FileZilla" msgstr "Ukončí aplikaci FileZilla" @@ -2027,89 +2161,90 @@ msgid "Close all running instances of FileZilla" msgstr "Zavře všechny běžící instance aplikace FileZilla" -#: resources.h:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:23 msgid "Closes current tab" msgstr "Zavře aktuální záložku" -#: resources.h:97 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Po&známky:" -#: ../../locales/../src/interface/listctrlex.cpp:759 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "Column properties" msgstr "Vlastnosti sloupců" -#: resources.h:365 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Nastavení sloupců" -#: resources.h:960 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1940 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/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:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 msgid "Command failed" msgstr "Provedení příkazu se nezdařilo" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:502 msgid "Command not supported" msgstr "Příkaz není podporován" -#: ../../locales/../src/engine/engineprivate.cpp:183 +#: ../../locales/../src/engine/engineprivate.cpp:212 msgid "Command not supported by this protocol" msgstr "Tento protokol nepodporuje daný příkaz" -#: ../../locales/../src/engine/logging.cpp:214 -#: ../../locales/../src/interface/StatusView.cpp:300 -#: ../../locales/../src/interface/StatusView.cpp:353 -#: ../../locales/../src/interface/updatewizard.cpp:552 +#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/interface/StatusView.cpp:283 +#: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" msgstr "Příkaz:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Poznámka" -#: ../../locales/../src/interface/verifycertdialog.cpp:179 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Společný název:" -#: ../../locales/../src/interface/netconfwizard.cpp:426 -#: ../../locales/../src/interface/netconfwizard.cpp:441 +#: ../../locales/../src/interface/netconfwizard.cpp:442 +#: ../../locales/../src/interface/netconfwizard.cpp:457 msgid "Communication tainted by router or firewall" msgstr "Komunikace poškozena routerem nebo firewallem" -#: resources.h:532 resources.h:667 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:82 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 msgid "Compare &modification time" msgstr "Porovnat čas poslední &změny" -#: resources.h:531 resources.h:666 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:78 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Porovnat &velikost souboru" -#: resources.h:940 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "&Práh porovnávání (v minutách):" -#: ../../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 "Práh pro porovnávání musí být mezi 0 a 1440 minutami." -#: resources.h:170 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:653 msgid "Compiled for:" msgstr "Cílová platforma:" -#: resources.h:171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:661 msgid "Compiled on:" msgstr "Překládáno na:" -#: resources.h:173 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:677 msgid "Compiled with:" msgstr "Překladač:" -#: resources.h:174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:685 msgid "Compiler flags:" msgstr "Parametry překladače:" @@ -2117,44 +2252,45 @@ msgid "Compressed" msgstr "Komprimovaný" -#: resources.h:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" msgstr "Souběžné přenosy" -#: resources.h:235 resources.h:449 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "&Rozlišovat v podmínkách velikost písmen" -#: resources.h:732 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" msgstr "Test nastavení" -#: resources.h:706 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:115 msgid "Configure passive mode" msgstr "Nastavení pasivního režimu" -#: resources.h:722 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:261 msgid "Configure port range" msgstr "Nastavení rozsahu portů" -#: resources.h:479 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Nastavení aplikace FileZilla a sítě" -#: ../../locales/../src/interface/search.cpp:1034 +#: ../../locales/../src/interface/search.cpp:768 msgid "Confirm deletion" msgstr "Vyžadováno potvrzení" -#: ../../locales/../src/engine/local_filesys.cpp:134 -#: ../../locales/../src/interface/LocalListView.cpp:2015 -#: ../../locales/../src/interface/LocalListView.cpp:2135 -#: ../../locales/../src/interface/RemoteListView.cpp:1725 -#: ../../locales/../src/interface/RemoteListView.cpp:2656 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1125 +#: ../../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 msgid "Confirmation needed" msgstr "Vyžadováno potvrzení" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulujeme, zdá se, že vaše nastavení funguje." @@ -2162,187 +2298,226 @@ msgid "Connect bypassing proxy settings" msgstr "Nastavení obcházení proxy" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 +msgid "Connect in current tab" +msgstr "Navázat připojení v aktuální záložce" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 +msgid "Connect in new tab" +msgstr "Navázat připojení na 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:943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 msgid "Connected" msgstr "Připojen" -#: ../../locales/../src/interface/QueueView.cpp:1441 +#: ../../locales/../src/interface/queue.cpp:326 msgid "Connecting" msgstr "Připojování" -#: ../../locales/../src/interface/netconfwizard.cpp:207 -#: ../../locales/../src/interface/statuslinectrl.cpp:280 +#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Připojování k %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1125 +#: ../../locales/../src/engine/ControlSocket.cpp:1050 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Připojování k %s přes proxy" +msgid "Connecting to %s through %s proxy" +msgstr "Připojování k %s přes proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:993 -#: ../../locales/../src/engine/proxy.cpp:168 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394 +#: ../../locales/../src/engine/ControlSocket.cpp:958 +#: ../../locales/../src/engine/proxy.cpp:243 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 #, c-format msgid "Connecting to %s..." msgstr "Připojování k %s..." -#: ../../locales/../src/interface/updatewizard.cpp:435 -#: ../../locales/../src/interface/updatewizard.cpp:1013 -msgid "Connecting to server" -msgstr "Připojování k serveru" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:92 msgid "Connection" msgstr "Připojení" -#: ../../locales/../src/interface/QueueView.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1073 +msgid "Connection aborted" +msgstr "Připojení bylo přerušeno" + +#: ../../locales/../src/interface/queue.cpp:327 msgid "Connection attempt failed" msgstr "Pokus o připojení se nezdařil" -#: ../../locales/../src/engine/ControlSocket.cpp:998 -#: ../../locales/../src/engine/proxy.cpp:172 +#: ../../locales/../src/engine/ControlSocket.cpp:922 +#: ../../locales/../src/engine/proxy.cpp:217 #, 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:1003 +#: ../../locales/../src/engine/ControlSocket.cpp:927 #, 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:186 -#: ../../locales/../src/engine/engineprivate.cpp:320 +#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Pokus o připojení přerušen uživatelem" -#: ../../locales/../src/interface/netconfwizard.cpp:543 +#: ../../locales/../src/engine/socket.cpp:1066 +msgid "Connection attempt timed out" +msgstr "Pokus o připojení překročil časový limit" + +#: ../../locales/../src/interface/netconfwizard.cpp:559 msgid "Connection closed" msgstr "Připojení bylo ukončeno" -#: ../../locales/../src/engine/ControlSocket.cpp:1091 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 msgid "Connection closed by server" msgstr "Připojení uzavřeno serverem" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:305 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 msgid "Connection established, initializing TLS..." msgstr "Připojení navázáno, inicializace TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 msgid "Connection established, sending HTTP request" msgstr "Připojení navázáno, posílání HTTP požadavku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 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:338 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Connection lost" msgstr "Připojení ztraceno" # Bez kontextu těžko přeložitelné -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:487 msgid "Connection not allowed by ruleset" msgstr "Připojení není povoleno souborem pravidel" -#: ../../locales/../src/engine/proxy.cpp:438 +#: ../../locales/../src/engine/proxy.cpp:496 msgid "Connection refused" msgstr "Připojení odmítnuto" -#: ../../locales/../src/engine/ControlSocket.cpp:640 -msgid "Connection timed out" -msgstr "Připojení překročilo časový limit" +#: ../../locales/../src/engine/socket.cpp:1060 +msgid "Connection refused by server" +msgstr "Připojení odmítnuto serverem" + +#: ../../locales/../src/engine/socket.cpp:1069 +msgid "Connection reset by network" +msgstr "Připojení resetováno sítí" + +#: ../../locales/../src/engine/socket.cpp:1074 +msgid "Connection reset by peer" +msgstr "Připojení resetováno druhou stranou" + +#: ../../locales/../src/engine/ControlSocket.cpp:559 +#, 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" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1077 msgid "Connection timed out." msgstr "Připojení překročilo časový limit." -#: ../../locales/../src/interface/search.cpp:677 +#: ../../locales/../src/interface/search.cpp:383 msgid "Connection to server lost." msgstr "Připojení se serverem ztraceno." -#: ../../locales/../src/engine/proxy.cpp:184 +#: ../../locales/../src/engine/proxy.cpp:226 msgid "Connection with proxy established, performing handshake..." msgstr "Připojení s proxy navázáno, vykonává se handshake..." -#: ../../locales/../src/interface/netconfwizard.cpp:561 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "Connection with server got closed prematurely." msgstr "Připojení se serverem bylo předčasně ukončeno." -#: ../../locales/../src/interface/netconfwizard.cpp:552 +#: ../../locales/../src/interface/netconfwizard.cpp:568 msgid "Connection with the test server failed." msgstr "Připojení s testovacím serverem se nezdařilo." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +msgid "Convert key file" msgstr "Převést soubor s klíčem" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:651 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 #, c-format msgid "Copy (%d) of %s" msgstr "Kopie (%d) %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:628 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 #, c-format msgid "Copy of %s" msgstr "Kopie %s" -#: resources.h:609 resources.h:661 +#: ../../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 "Kopírovat URL vybraných položek do schránky." -#: ../../locales/../src/engine/transfersocket.cpp:215 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Nelze navázat připojení %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:99 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:551 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 msgid "Could not add connection to Site Manager" msgstr "Nelze přidat připojení do Správce míst" -#: ../../locales/../src/interface/state.cpp:842 +#: ../../locales/../src/interface/state.cpp:757 msgid "Could not complete operation" msgstr "Nelze dokončit operaci" -#: ../../locales/../src/engine/ControlSocket.cpp:188 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Could not connect to server" msgstr "Nelze se připojit k serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:1167 +#: ../../locales/../src/engine/ControlSocket.cpp:1087 #, c-format msgid "Could not connect to server: %s" msgstr "Nelze se připojit k serveru: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 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/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 msgid "Could not convert private key" msgstr "Nelze převést soukromý klíč" -#: ../../locales/../src/interface/RemoteListView.cpp:3090 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1454 +#: ../../locales/../src/interface/RemoteListView.cpp:2532 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 msgid "Could not copy URLs" msgstr "Nelze kopírovat URL" -#: ../../locales/../src/interface/aboutdialog.cpp:242 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Nelze kopírovat data" -#: ../../locales/../src/interface/RemoteListView.cpp:2578 -#: ../../locales/../src/interface/RemoteTreeView.cpp:899 +#: ../../locales/../src/interface/updater.cpp:458 +#, 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 +#, 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 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 " @@ -2352,11 +2527,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:4306 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 msgid "Could not establish connection to server" msgstr "Nelze se připojit k serveru" -#: ../../locales/../src/interface/FileZilla.cpp:493 +#: ../../locales/../src/interface/FileZilla.cpp:406 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2368,11 +2543,11 @@ "“ z příkazového řádku nebo nastavením proměnné prostředí " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 msgid "Could not generate custom login sequence." msgstr "Nelze vytvořit vlastní přihlašovací sekvenci." -#: ../../locales/../src/engine/tlssocket.cpp:1021 +#: ../../locales/../src/engine/tlssocket.cpp:956 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2380,7 +2555,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:997 +#: ../../locales/../src/engine/tlssocket.cpp:933 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2388,27 +2563,28 @@ "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:1079 +#: ../../locales/../src/interface/state.cpp:929 msgid "Could not get full remote path." msgstr "Nelze získat plnou vzdálenou cestu." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 msgid "Could not get reply from fzputtygen." msgstr "Nelze získat odpověď od fzputtygen." -#: ../../locales/../src/interface/RemoteListView.cpp:2639 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/search.cpp:712 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:939 +#: ../../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:933 +#: ../../locales/../src/engine/tlssocket.cpp:874 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2416,8 +2592,8 @@ "Nelze inicializovat strukturu certifikátů druhé strany, vykonání funkce " "gnutls_x509_crt_init se nezdařilo" -#: ../../locales/../src/interface/import.cpp:119 -#: ../../locales/../src/interface/import.cpp:310 +#: ../../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 " @@ -2428,53 +2604,53 @@ "přístup.\n" "Změny provedené ve správci míst nebudou uloženy." -#: ../../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 "Nelze načíst soubor s klíčem" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 msgid "Could not load private key" msgstr "Nelze načíst soukromý klíč" -#: ../../locales/../src/interface/state.cpp:1105 +#: ../../locales/../src/interface/state.cpp:951 #, 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 "" "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:404 +#: ../../locales/../src/interface/state.cpp:361 #, 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 "" "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:295 +#: ../../locales/../src/interface/state.cpp:266 #, 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 "" "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:242 -#: ../../locales/../src/interface/RemoteListView.cpp:3090 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1454 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2532 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 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:276 -#: ../../locales/../src/engine/logging.cpp:307 #, c-format msgid "Could not open log file: %s" msgstr "Nelze otevřít soubor protokolu: %s" @@ -2483,65 +2659,64 @@ msgid "Could not parse remote path." msgstr "Nelze analyzovat vzdálenou cestu." -#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../../locales/../src/interface/quickconnectbar.cpp:82 msgid "Could not parse server address:" msgstr "Nelze analyzovat adresu serveru:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 #, c-format msgid "Could not read from socket: %s" msgstr "Nelze číst ze soketu: %s" -#: ../../locales/../src/interface/sitemanager.cpp:484 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Nelze přečíst položku serveru." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2741 +#: ../../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/engine/ftpcontrolsocket.cpp:2651 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2502 msgid "Could not seek to the end of the file" msgstr "Nelze se přesunout na konec souboru" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 msgid "Could not send command to fzputtygen." msgstr "Nelze poslat příkaz pro fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2772 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 msgid "Could not spawn IO thread" msgstr "Nelze spustit vlákno pro vstup a výstup" -#: ../../locales/../src/engine/ControlSocket.cpp:1140 +#: ../../locales/../src/engine/ControlSocket.cpp:1064 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Nelze začít handshake s proxy: %s" -#: ../../locales/../src/interface/QueueView.cpp:1104 -#: ../../locales/../src/interface/QueueView.cpp:1109 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Could not start transfer" msgstr "Nelze spustit přenos" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:809 +#: ../../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" +"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:858 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 #, 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" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:330 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 #, 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" -#: ../../locales/../src/interface/QueueView.cpp:1980 +#: ../../locales/../src/interface/QueueView.cpp:1850 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2550,94 +2725,119 @@ "Nelze zapsat „%s“, frontu nelze uložit.\n" "%s" -#: ../../locales/../src/interface/sitemanager.cpp:781 -#: ../../locales/../src/interface/sitemanager.cpp:841 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196 +#: ../../locales/../src/interface/sitemanager.cpp:720 +#: ../../locales/../src/interface/sitemanager.cpp:774 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 #, 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/wrapengine.cpp:1147 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format -msgid "Could not write \"%s\": %s" -msgstr "Nelze zapsat „%s“: %s" +msgid "Could not write \"%s\":" +msgstr "Nelze zapsat „%s“:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Nelze zapsat soubor s klíčem: %s" -#: ../../locales/../src/interface/QueueView.cpp:1098 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Could not write to local file" msgstr "Nelze zapsat místní soubor" -#: ../../locales/../src/engine/logging.cpp:315 -#: ../../locales/../src/engine/logging.cpp:386 +#: ../../locales/../src/engine/logging.cpp:215 +#: ../../locales/../src/engine/logging.cpp:280 #, c-format msgid "Could not write to log file: %s" msgstr "Nelze zapsat do souboru protokolu: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/ControlSocket.cpp:1056 +#: ../../locales/../src/engine/ControlSocket.cpp:882 +#: ../../locales/../src/engine/ControlSocket.cpp:986 #, c-format msgid "Could not write to socket: %s" msgstr "Nelze zapsat do soketu: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:184 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "Země:" -#: resources.h:638 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "Nechá aplikaci FileZilla spadnout. Používá se k ladění obsluhy výjimek" - -#: resources.h:601 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" msgstr "&Vytvořit nový soubor" -#: resources.h:586 resources.h:600 resources.h:655 resources.h:676 +#: ../../locales/../src/interface/state.cpp:965 +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 +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 msgid "Create a new subdirectory in the current directory" msgstr "Vytvořit novou podsložku v aktuální složce" -#: resources.h:602 +#: ../../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 "Vytvořit novou podsložku v aktuální složce a vstoupit do ní" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:313 msgid "Create a new, empty file in the current directory" msgstr "Vytvoří nový prázdný soubor v aktuální složce" -#: ../../locales/../src/interface/LocalListView.cpp:1187 -#: ../../locales/../src/interface/LocalTreeView.cpp:1176 -#: ../../locales/../src/interface/RemoteListView.cpp:1627 -#: ../../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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +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 msgid "Create directory" msgstr "Nová složka" -#: ../../locales/../src/interface/RemoteListView.cpp:3181 +#: ../../locales/../src/interface/RemoteListView.cpp:2619 msgid "Create empty file" msgstr "Vytvořit prázdný soubor" -#: ../../locales/../src/interface/QueueView.cpp:1514 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Creating directory" msgstr "Vytváření složky" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3346 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 #, c-format msgid "Creating directory '%s'..." msgstr "Vytváření složky „%s“..." -#: ../../locales/../src/engine/ControlSocket.cpp:174 +#: ../../locales/../src/engine/ControlSocket.cpp:179 msgid "Critical error" msgstr "Kritická chyba" -#: ../../locales/../src/engine/ControlSocket.cpp:137 +#: ../../locales/../src/engine/ControlSocket.cpp:170 +msgid "Critical error:" +msgstr "Kritická chyba:" + +#: ../../locales/../src/engine/ControlSocket.cpp:134 msgid "Critical file transfer error" msgstr "Kritická chyba při přenosu souboru" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:119 #, 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:393 +#: ../../locales/../src/interface/state.cpp:352 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2646,59 +2846,73 @@ "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:423 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "Aktuální způsob přenosu je nastaven na ASCII." -#: ../../locales/../src/interface/statusbar.cpp:433 +#: ../../locales/../src/interface/statusbar.cpp:401 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:428 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "Aktuální způsob přenosu je nastaven na binární." -#: resources.h:795 resources.h:916 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +msgid "Curve:" +msgstr "Křivka:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:478 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" msgstr "V&lastní" -#: ../../locales/../src/interface/filter.cpp:98 +#: ../../locales/../src/interface/filter.cpp:100 msgid "Custom filter set" msgstr "Vlastní sada filtrů" -#: resources.h:387 resources.h:388 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Vlastní server" -#: resources.h:396 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Typ &dat" -#: resources.h:923 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1626 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ů)" -#: resources.h:110 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "Vý&chozí" -#: resources.h:604 resources.h:656 resources.h:686 +#: ../../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 "&Odstranit" -#: resources.h:216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +#, fuzzy +msgid "D&irectory comparison" +msgstr "Porovnání složek" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "&Zakázat všechny" -#: resources.h:894 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "&Neukládat hesla" -#: resources.h:947 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "Akce p&o dvojitém kliknutí na složku:" -#: resources.h:229 resources.h:428 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "D&uplikovat" @@ -2706,17 +2920,16 @@ msgid "DOS-like with virtual paths" msgstr "Jako DOS, ale s virtuálními cestami" -#: ../../locales/../src/interface/LocalListView.cpp:2049 -#: ../../locales/../src/interface/RemoteListView.cpp:2690 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Nebezpečný typ souboru" -#: ../../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:991 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +#: ../../locales/../src/interface/netconfwizard.cpp:1058 msgid "Data socket closed too early." msgstr "Datový soket se uzavřel příliš brzy." @@ -2724,30 +2937,27 @@ msgid "Date" msgstr "Datum" -#: resources.h:907 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" msgstr "Formátování data" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:128 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" msgstr "Formát data a času" -#: ../../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 "Neznámé datum nebo čas" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:141 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" msgstr "Ladění" -#: resources.h:991 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" msgstr "Nastavení ladění" -#: resources.h:101 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Výchozí mís&tní složka:" @@ -2755,19 +2965,21 @@ msgid "Default (Autodetect)" msgstr "Výchozí (automatická detekce)" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:81 msgid "Default editor not properly quoted." msgstr "Výchozí editor nemá správně zadány uvozovky." -#: resources.h:266 resources.h:288 resources.h:877 +#: ../../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 "Výchozí chování, pokud soubor již existuje" -#: resources.h:103 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "Výchozí v&zdálená složka:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061 +#: ../../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." @@ -2775,20 +2987,21 @@ "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:78 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:71 msgid "Default system language" msgstr "Výchozí jazyk systému" -#: resources.h:700 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" msgstr "Výchozí režim přenosu:" # asi by nemměla být dvojtečka -#: resources.h:846 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" msgstr "Výchozí typ přenosu:" -#: resources.h:719 resources.h:782 +#: ../../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 "Výchozí: http://ip.filezilla-project.org/ip.php" @@ -2798,7 +3011,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:630 +#: ../../locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2816,63 +3029,83 @@ "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:1223 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" msgstr "Odstranit položku ve správci míst" -#: resources.h:657 resources.h:678 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" msgstr "Odstranit vybranou složku" -#: resources.h:589 resources.h:605 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:277 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" msgstr "Odstranit vybrané soubory a složky" -#: ../../locales/../src/interface/search.cpp:1018 +#: ../../locales/../src/engine/engineprivate.cpp:365 +#, c-format +msgid "Deleting \"%s\"" +msgstr "Odstraňování „%s“" + +#: ../../locales/../src/engine/engineprivate.cpp:368 +#, 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:1018 +#: ../../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" -#: resources.h:464 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Odstraňování symbolického odkazu" -#: ../../locales/../src/interface/LocalTreeView.cpp:1042 +#: ../../locales/../src/interface/LocalTreeView.cpp:958 msgid "Desktop" msgstr "Plocha" -#: 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 "Podrobnosti" -#: resources.h:200 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Podrobnosti nového klíče:" -#: resources.h:238 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +msgid "Detected newer version of FileZilla" +msgstr "Zjištěna novější verze aplikace FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "&Složky" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Direction" msgstr "Směr" -#: ../../locales/../src/interface/filelistctrl.cpp:283 +#: ../../locales/../src/interface/filelistctrl.cpp:271 msgid "Directory" msgstr "Složka" -#: resources.h:664 resources.h:938 resources.h:1026 -#: ../../locales/../src/interface/filelistctrl.cpp:449 -#: ../../locales/../src/interface/Mainfrm.cpp:2386 +#: ../../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 msgid "Directory comparison" msgstr "Porovnání složek" -#: ../../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 "Porovnání složek se nezdařilo" @@ -2880,91 +3113,92 @@ 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:192 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing aborted by user" msgstr "Výpis složky přerušen uživatelem" -#: ../../locales/../src/interface/RemoteListView.cpp:2380 +#: ../../locales/../src/interface/RemoteListView.cpp:2023 msgid "Directory listing failed" msgstr "Výpis složky se nezdařil" -#: resources.h:209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Filtry výpisu složky" -#: ../../locales/../src/engine/ControlSocket.cpp:196 +#: ../../locales/../src/engine/ControlSocket.cpp:198 +#, c-format +msgid "Directory listing of \"%s\" successful" +msgstr "Výpis složky „%s“ proběhl úspěšně" + +#: ../../locales/../src/engine/ControlSocket.cpp:195 msgid "Directory listing successful" msgstr "Výpis složky proběhl úspěšně" -#: resources.h:219 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "Z&akázat všechny" -#: ../../locales/../src/interface/state.cpp:1113 +#: ../../locales/../src/interface/state.cpp:958 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:681 +#: ../../locales/../src/interface/Mainfrm.cpp:649 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í." -#: resources.h:1019 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 msgid "Disconnect from server" msgstr "Odpojení od serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:82 -#: ../../locales/../src/engine/ControlSocket.cpp:959 -#: ../../locales/../src/engine/ControlSocket.cpp:1058 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:936 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:938 -#: ../../locales/../src/interface/QueueView.cpp:1051 -#: ../../locales/../src/interface/QueueView.cpp:1095 +#: ../../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 msgid "Disconnected from server" msgstr "Odpojen od serveru" -#: ../../locales/../src/engine/ControlSocket.cpp:1093 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:953 +#: ../../locales/../src/engine/ControlSocket.cpp:1019 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 #, c-format msgid "Disconnected from server: %s" msgstr "Odpojen od serveru: %s" -#: ../../locales/../src/interface/QueueView.cpp:1412 -#: ../../locales/../src/interface/statuslinectrl.cpp:274 +#: ../../locales/../src/interface/queue.cpp:324 +#: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Odpojování od předchozího serveru" -#: resources.h:1020 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnects from the currently visible server" msgstr "Odpojení od aktuálně zobrazeného serveru" -#: resources.h:574 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "Zobrazí dialog s informacemi o programu" -#: resources.h:956 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "&Nepoužívat výchozí editor" -#: resources.h:630 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:410 msgid "Do ¬hing" msgstr "&Nedělat nic" -#: ../../locales/../src/interface/updatewizard.cpp:259 -msgid "" -"Do you really want to check for beta versions?\n" -"Unless you want to test new features, keep using stable versions." -msgstr "" -"Opravdu chcete zjišťovat i betaverze?\n" -"Pokud nechcete testovat nové funkce, používejte stabilní verze." +#: ../../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 "Provést to samé se &všemi soubory, které jsou upravovány" -#: ../../locales/../src/interface/Mainfrm.cpp:1239 -#: ../../locales/../src/interface/Mainfrm.cpp:1263 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "Do you really want to close FileZilla?" msgstr "Opravdu chcete ukončit aplikaci FileZilla?" @@ -2979,7 +3213,7 @@ 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:1225 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Opravdu chcete odstranit vybranou položku?" @@ -2987,58 +3221,64 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Opravdu chcete odstranit frontu přenosů?" -#: ../../locales/../src/interface/Mainfrm.cpp:597 +#: ../../locales/../src/interface/Mainfrm.cpp:588 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Opravdu chcete poslat „%s“ serveru?" -#: resources.h:477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 +msgid "Do you want to reopen this file?" +msgstr "Chcete znovu otevřít tento soubor?" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentace" -#: resources.h:721 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:250 msgid "Don't use external IP address on &local connections." msgstr "Nepoužívat externí IP adresu pro &místní připojení." -#: resources.h:857 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 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" -#: resources.h:941 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" msgstr "Akce po dvojitém kliknutí" -#: resources.h:373 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Stáhnout" -#: resources.h:493 resources.h:833 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limit s&tahování:" -#: ../../locales/../src/interface/statusbar.cpp:604 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Limit pro stahování: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:606 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Limit pro stahování: žádný" -#: resources.h:452 ../../locales/../src/interface/search.cpp:818 -#: ../../locales/../src/interface/search.cpp:824 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3110 +#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:523 msgid "Download search results" msgstr "Stáhnout výsledky hledání" -#: resources.h:651 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Stáhnout vybranou složku" -#: resources.h:593 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" msgstr "Stáhnout vybrané soubory a složky" -#: ../../locales/../src/interface/Mainfrm.cpp:1063 +#: ../../locales/../src/interface/Mainfrm.cpp:965 #, c-format msgid "" "Download speed: %s/s\n" @@ -3047,29 +3287,32 @@ "Rychlost stahování: %s/s\n" "Rychlost odesílání: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1253 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "Stahování" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:358 -#: ../../locales/../src/interface/updatewizard.cpp:423 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 #, c-format msgid "Downloading %s" msgstr "Stahování %s" -#: ../../locales/../src/interface/search.cpp:927 +#: ../../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:927 +#: ../../locales/../src/interface/search.cpp:615 msgid "Downloading search results" msgstr "Stahování výsledků hledání" -#: ../../locales/../src/interface/LocalListView.cpp:104 -#: ../../locales/../src/interface/LocalTreeView.cpp:104 -#: ../../locales/../src/interface/QueueView.cpp:83 +#: ../../locales/../src/interface/resources/xrc/update.xrc:81 +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:88 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3077,77 +3320,92 @@ "Přetažení mezi různými instancemi aplikace FileZilla zatím nebylo " "implementováno." -#: ../../locales/../src/interface/LocalListView.cpp:110 -#: ../../locales/../src/interface/LocalTreeView.cpp:110 -#: ../../locales/../src/interface/QueueView.cpp:96 +#: ../../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:94 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 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." -#: resources.h:87 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" msgstr "Dupli&kovat" -#: resources.h:215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "Povolit &všechny" -#: resources.h:579 resources.h:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:250 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:296 msgid "E&nter directory" msgstr "Ot&evřít složku" -#: resources.h:151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 msgid "E&xecute" msgstr "Sp&ouštění" -#: resources.h:519 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" msgstr "&Konec" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../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 "&Exportovat..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "E-Mail:" msgstr "E-mail:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 msgid "Each filter needs at least one condition." msgstr "Každý filtr musí mít alespoň jednu podmínku." -#: resources.h:241 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "Upravit filtry" -#: resources.h:584 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:260 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/LocalListView.cpp:1960 -#: ../../locales/../src/interface/LocalListView.cpp:1971 +#: ../../locales/../src/interface/search.cpp:700 +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 msgid "Editing failed" msgstr "Úpravy se nezdařily" -#: resources.h:904 +#: ../../locales/../src/interface/search.cpp:700 +msgid "Editing search results" +msgstr "Úprava výsledků hledání" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "E-mail:" -#: ../../locales/../src/interface/QueueView.cpp:2290 +#: ../../locales/../src/interface/QueueView.cpp:2123 msgid "Empty command" msgstr "Prázdný příkaz" -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:59 msgid "Empty command." msgstr "Prázdný příkaz." -#: ../../locales/../src/interface/RemoteListView.cpp:2382 +#: ../../locales/../src/interface/RemoteListView.cpp:2025 msgid "Empty directory listing" msgstr "Prázdný výpis složky" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Prázdná složka." -#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53 +#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:52 msgid "Empty file extension." msgstr "Prázdná přípona." @@ -3161,15 +3419,15 @@ msgid "Empty name" msgstr "Chybí název" -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:84 msgid "Empty quoted string." msgstr "Prázdný řetězec v uvozovkách." -#: resources.h:218 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "P&ovolit všechny" -#: resources.h:842 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Povolit &filtrování neplatných znaků" @@ -3177,36 +3435,35 @@ msgid "Encrypted" msgstr "Šifrovaný" -#: resources.h:355 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Šifrování" -#: resources.h:347 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Podrobnosti šifrování" -#: ../../locales/../src/interface/filelistctrl.cpp:451 +#: ../../locales/../src/interface/filelistctrl.cpp:465 msgid "End comparison and change sorting order?" msgstr "Ukončit porovnání a změnit řazení?" -#: resources.h:560 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "Zadat &vlastní příkaz..." -#: resources.h:497 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Zadejte 0 pro neomezenou rychlost." -#: ../../locales/../src/interface/QueueView.cpp:2279 +#: ../../locales/../src/interface/QueueView.cpp:2112 msgid "Enter command" msgstr "Zadejte příkaz" -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Zadat vlastní příkaz" -#: resources.h:948 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" msgstr "Otevřít složku" @@ -3216,23 +3473,24 @@ msgid "Enter filter name" msgstr "Zadejte název filtru" -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:333 msgid "Enter name for filterset" msgstr "Zadejte název sady filtrů" -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:391 msgid "Enter new name for filterset" msgstr "Zadejte nový název sady filtrů" -#: resources.h:126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 msgid "Enter password" msgstr "Zadejte heslo" -#: resources.h:580 resources.h:597 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:251 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Enter selected directory" msgstr "Otevřít vybranou složku" -#: resources.h:741 +#: ../../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 " @@ -3242,7 +3500,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)" @@ -3254,21 +3512,21 @@ "heslo@hostitel:port, hodnoty v ostatních polích pak budou přepsány.\n" "\n" "Podporované protokoly:\n" -"- ftp:// pro běžné FTP\n" +"- ftp:// pro běžné FTP s možností šifrování\n" "- sftp:// pro protokol přenosu souborů přes SSH\n" "- ftps:// pro FTP přes TLS (implicitní)\n" "- ftpes:// pro FTP přes TLS (explicitní)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, 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 "" "Zadejte heslo pro soubor „%s“.\n" -"Převedený soubor již nebude dále chráněn heslem." +"Převedený soubor bude chráněn stejným heslem." -#: resources.h:745 +#: ../../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." @@ -3276,7 +3534,7 @@ "Zadejte port, na kterém server naslouchá.\n" "Výchozí port pro FTP je 21, pro SFTP 22." -#: ../../locales/../src/interface/loginmanager.cpp:63 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Zadejte uživatelské jméno a heslo" @@ -3285,135 +3543,109 @@ msgstr "Při exportu nastavení došlo k chybě" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:38 -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Při importu došlo k chybě" -#: ../../locales/../src/interface/QueueView.cpp:2047 +#: ../../locales/../src/interface/QueueView.cpp:1912 msgid "Error loading queue" msgstr "Chyba při načítání fronty" -#: ../../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:1034 -#: ../../locales/../src/interface/import.cpp:120 -#: ../../locales/../src/interface/import.cpp:311 -#: ../../locales/../src/interface/Options.cpp:216 -#: ../../locales/../src/interface/QueueView.cpp:1960 -#: ../../locales/../src/interface/search.cpp:1095 -#: ../../locales/../src/interface/search.cpp:1116 -#: ../../locales/../src/interface/sitemanager.cpp:248 -#: ../../locales/../src/interface/sitemanager.cpp:445 -#: ../../locales/../src/interface/sitemanager.cpp:543 -#: ../../locales/../src/interface/sitemanager.cpp:602 -#: ../../locales/../src/interface/sitemanager.cpp:720 -#: ../../locales/../src/interface/sitemanager.cpp:805 -#: ../../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: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 msgid "Error loading xml file" msgstr "Chyba při načítání XML souboru" -#: ../../locales/../src/interface/QueueView.cpp:1946 +#: ../../locales/../src/interface/QueueView.cpp:1822 msgid "Error saving queue" msgstr "Chyba při ukládání fronty" -#: ../../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:203 msgid "Error starting program" msgstr "Chyba spouštění programu" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:331 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:859 -#: ../../locales/../src/interface/QueueView.cpp:1981 -#: ../../locales/../src/interface/sitemanager.cpp:657 -#: ../../locales/../src/interface/sitemanager.cpp:782 -#: ../../locales/../src/interface/sitemanager.cpp:842 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:810 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197 -#: ../../locales/../src/interface/wrapengine.cpp:1148 +#: ../../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 msgid "Error writing xml file" msgstr "Chyba při zápisu XML souboru" -#: ../../locales/../src/interface/updatewizard.cpp:343 -msgid "Error, file name cannot be parsed." -msgstr "Chyba, název souboru nelze analyzovat." - -#: ../../locales/../src/interface/updatewizard.cpp:359 -msgid "Error, local file exists but cannot be removed" -msgstr "Chyba, místní soubor existuje, ale nelze ho odstranit" - -#: ../../locales/../src/engine/logging.cpp:213 -#: ../../locales/../src/interface/StatusView.cpp:298 -#: ../../locales/../src/interface/StatusView.cpp:349 -#: ../../locales/../src/interface/updatewizard.cpp:546 +#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/interface/StatusView.cpp:281 +#: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" msgstr "Chyba:" -#: resources.h:489 -msgid "Establish connection in a new tab" -msgstr "Navázat připojení v nové záložce" - -#: resources.h:973 -msgid "Every month" -msgstr "Každý měsíc" - -#: resources.h:972 -msgid "Every two weeks" -msgstr "Každé dva týdny" - -#: resources.h:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2013 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open" msgstr "Příklad: png \"c:\\program files\\viewer\\viewer.exe\" -open" -#: resources.h:926 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1663 msgid "Examples" msgstr "Příklady" -#: resources.h:155 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:489 msgid "Exe&cute" msgstr "Spo&uštění" -#: ../../locales/../src/interface/updatewizard.cpp:328 -msgid "Executable" -msgstr "Spustitelný soubor" - -#: ../../locales/../src/interface/Mainfrm.cpp:1819 +#: ../../locales/../src/interface/update_dialog.cpp:57 msgid "Executable contains no version info, cannot check for updates." msgstr "" "Spustitelný soubor neobsahuje informaci o verzi, nelze zkontrolovat " "aktualizace." -#: resources.h:884 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Průzkumník" -#: resources.h:305 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" msgstr "Exportovat &frontu" -#: resources.h:304 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "Exportovat &nastavení" -#: resources.h:301 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Nastavení exportu" -#: resources.h:230 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "Ná&zev filtru:" -#: ../../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:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" @@ -3425,17 +3657,17 @@ msgid "FTP - Insecure File Transfer Protocol" msgstr "FTP - Nezabezpečený File Transfer Protocol" -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "FTP jádro není inicializováno, nelze se připojit" -#: resources.h:769 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:232 msgid "FTP Keep-alive" msgstr "Udržovat připojení FTP" -#: resources.h:789 -#: ../../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 proxy" @@ -3443,7 +3675,7 @@ msgid "FTP URL" msgstr "FTP URL" -#: resources.h:697 +#: ../../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." @@ -3452,181 +3684,171 @@ "být navázána dvěma způsoby." #: ../../locales/../src/engine/server.cpp:20 -msgid "FTPES - FTP over explicit TLS/SSL" -msgstr "FTPES - FTP přes explicitní TLS/SSL" +msgid "FTPES - FTP over explicit TLS" +msgstr "FTPES - FTP přes explicitní TLS" #: ../../locales/../src/engine/server.cpp:19 -msgid "FTPS - FTP over implicit TLS/SSL" -msgstr "FTPS - FTP přes implicitní TLS/SSL" +msgid "FTPS - FTP over implicit TLS" +msgstr "FTPS - FTP přes implicitní TLS" -#: ../../locales/../src/interface/LocalListView.cpp:550 -#: ../../locales/../src/interface/LocalListView.cpp:630 -#: ../../locales/../src/interface/LocalListView.cpp:2256 -#: ../../locales/../src/interface/LocalTreeView.cpp:900 -#: ../../locales/../src/interface/viewheader.cpp:535 +#: ../../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 msgid "Failed to change directory" msgstr "Nezdařilo se změnit složku" -#: ../../locales/../src/interface/FileZilla.cpp:263 -#: ../../locales/../src/interface/FileZilla.cpp:271 -#: ../../locales/../src/interface/FileZilla.cpp:273 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../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 msgid "Failed to change language" msgstr "Nezdařilo se změnit jazyk" -#: ../../locales/../src/interface/updatewizard.cpp:464 -msgid "Failed to check for newer version of FileZilla." -msgstr "Nezdařilo se zkontrolovat existenci novější verze aplikace FileZilla." - -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 msgid "Failed to copy or move sites" msgstr "Nezdařilo se zkopírovat nebo přesunout místa" -#: ../../locales/../src/interface/xmlfunctions.cpp:519 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 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:797 +#: ../../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/engine/ftpcontrolsocket.cpp:4281 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4285 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 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/updatewizard.cpp:466 -msgid "Failed to download the latest version of FileZilla." -msgstr "Nezdařilo se stáhnout novější verzi aplikace FileZilla." - -#: ../../locales/../src/interface/LocalTreeView.cpp:665 +#: ../../locales/../src/interface/LocalTreeView.cpp:625 msgid "Failed to get 'My Documents' path" msgstr "Nezdařilo se získat cestu ke složce „Dokumenty“" -#: ../../locales/../src/interface/LocalTreeView.cpp:651 +#: ../../locales/../src/interface/LocalTreeView.cpp:613 msgid "Failed to get desktop path" msgstr "Nezdařilo se získat cestu k ploše" -#: ../../locales/../src/interface/netconfwizard.cpp:956 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -"Nezdařilo se získat kolegovu adresu kontrolního připojení, připojení " +"Nezdařilo se získat adresu kontrolního připojení druhé strany, připojení " "ukončeno." -#: ../../locales/../src/interface/netconfwizard.cpp:964 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -"Nezdařilo se získat kolegovu adresu datového připojení, připojení ukončeno." +"Nezdařilo se získat adresu datového připojení druhé strany, připojení " +"ukončeno." -#: ../../locales/../src/interface/context_control.cpp:79 +#: ../../locales/../src/interface/context_control.cpp:80 msgid "Failed to initialize FTP engine" msgstr "Nezdařilo se inicializovat FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 msgid "Failed to initialize TLS." msgstr "Nezdařilo se inicializovat TLS." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:173 +#: ../../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/settings/optionspage_connection_sftp.cpp:299 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 #, 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:2640 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 #, 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:2702 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Nezdařilo se otevřít „%s“ pro čtení" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2681 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:391 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:448 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Nezdařilo se otevřít „%s“ pro zapisování" -#: ../../locales/../src/engine/ControlSocket.cpp:418 +#: ../../locales/../src/engine/ControlSocket.cpp:346 msgid "Failed to parse returned path." msgstr "Nelze analyzovat vrácenou cestu." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 -msgid "Failed to parse trusted root cert." -msgstr "Analýza důvěryhodného kořenového certifikátu se nezdařila." - -#: ../../locales/../src/interface/netconfwizard.cpp:1020 +#: ../../locales/../src/interface/netconfwizard.cpp:1023 msgid "Failed to receive data" msgstr "Nezdařilo se přijmout data" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:192 msgid "Failed to retrieve directory listing" msgstr "Nezdařilo se získat výpis složky" -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../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/engine/ftpcontrolsocket.cpp:3977 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 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:3999 +#: ../../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:688 +#: ../../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/interface/netconfwizard.cpp:616 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Failed to retrieve the external IP address." msgstr "Nezdařilo se získat externí IP adresu." -#: ../../locales/../src/interface/netconfwizard.cpp:307 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Nezdařilo se poslat příkaz." -#: ../../locales/../src/interface/FileZilla.cpp:271 +#: ../../locales/../src/interface/FileZilla.cpp:152 #, 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:256 +#: ../../locales/../src/interface/FileZilla.cpp:130 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"Nezdařilo se nastavit jazyk na %s (%s), používá se výchozí jazyk systému (%" -"s, %s)." +"Nezdařilo se nastavit jazyk na %s (%s), používá se výchozí jazyk systému " +"(%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:244 +#: ../../locales/../src/interface/FileZilla.cpp:119 #, 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:273 -#: ../../locales/../src/interface/settings/optionspage_language.cpp:53 +#: ../../locales/../src/interface/FileZilla.cpp:154 +#: ../../locales/../src/interface/settings/optionspage_language.cpp:51 #, 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:252 +#: ../../locales/../src/interface/FileZilla.cpp:126 #, 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:241 +#: ../../locales/../src/interface/FileZilla.cpp:116 #, 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." @@ -3635,16 +3857,16 @@ msgid "Failed to validate settings" msgstr "Chyba v nastavení" -#: ../../locales/../src/engine/tlssocket.cpp:1079 +#: ../../locales/../src/engine/tlssocket.cpp:1105 msgid "Failed to verify peer certificate" msgstr "Nezdařilo se ověřit certifikát druhé strany" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:566 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 #, 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:537 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "Došlo k chybě při zápisu XML souboru" @@ -3652,111 +3874,115 @@ msgid "Failed transfers" msgstr "Neúspěšné přenosy" -#: resources.h:712 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:159 msgid "Fall back to active mode" msgstr "Vrátit se k aktivnímu režimu" -#: resources.h:380 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Sou&bor:" -#: resources.h:237 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Sou&bory" -#: ../../locales/../src/interface/filelistctrl.cpp:282 +#: ../../locales/../src/interface/filelistctrl.cpp:270 msgid "File" msgstr "Soubor" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:124 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:100 msgid "File Types" msgstr "Typy souborů" -#: ../../locales/../src/interface/import.cpp:108 +#: ../../locales/../src/engine/socket.cpp:1065 +msgid "File descriptor not a socket" +msgstr "Popisovač souboru není soketem" + +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "Soubor neobsahuje žádné údaje, které lze importovat." -#: ../../locales/../src/interface/settings/settingsdialog.cpp:132 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Úprava souborů" -#: ../../locales/../src/interface/RemoteListView.cpp:1935 +#: ../../locales/../src/interface/RemoteListView.cpp:1603 msgid "File exists" msgstr "Soubor existuje" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:125 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:101 msgid "File exists action" msgstr "Soubor již existuje" -#: resources.h:316 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "Soubor byl změněn" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:130 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:106 msgid "File lists" msgstr "Výpis souborů a složek" -#: ../../locales/../src/interface/edithandler.cpp:1730 -#: ../../locales/../src/interface/FileZilla.cpp:712 -#: ../../locales/../src/interface/FileZilla.cpp:806 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188 +#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: resources.h:1030 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 msgid "File search" msgstr "Hledání souboru" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:126 msgid "File transfer aborted by user" msgstr "Přenos souborů přerušen uživatelem" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:117 #, 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:139 +#: ../../locales/../src/engine/ControlSocket.cpp:136 msgid "File transfer failed" msgstr "Přenos souboru se nezdařil" -#: ../../locales/../src/engine/ControlSocket.cpp:122 +#: ../../locales/../src/engine/ControlSocket.cpp:121 #, 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:134 +#: ../../locales/../src/engine/ControlSocket.cpp:131 msgid "File transfer skipped" msgstr "Přenos souboru přeskočen" -#: ../../locales/../src/engine/ControlSocket.cpp:132 +#: ../../locales/../src/engine/ControlSocket.cpp:129 msgid "File transfer successful" msgstr "Přenos souboru úspěšný" -#: ../../locales/../src/engine/ControlSocket.cpp:115 +#: ../../locales/../src/engine/ControlSocket.cpp:114 #, 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:1238 +#: ../../locales/../src/interface/Mainfrm.cpp:1136 msgid "File transfers still in progress." msgstr "Přenosy souborů stále probíhají." -#: resources.h:398 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "Soubor by měl být přenášen jako ASCII." -#: resources.h:399 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 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:494 -#: ../../locales/../src/interface/quickconnectbar.cpp:69 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/FileZilla.cpp:407 +#: ../../locales/../src/interface/quickconnectbar.cpp:66 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "FileZilla hlásí chybu" -#: resources.h:734 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:353 msgid "" "FileZilla can now test your configuration to ensure everything is configured " "properly." @@ -3764,156 +3990,160 @@ "FileZilla nyní může otestovat vaše nastavení, aby se ujistila, že je vše " "nastaveno správně." -#: resources.h:488 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "Aplikace FileZilla je již k serveru připojena." -#: ../../locales/../src/interface/Mainfrm.cpp:1568 +#: ../../locales/../src/interface/Mainfrm.cpp:1440 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." -#: resources.h:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" msgstr "Aktualizace aplikace FileZilla" -#: resources.h:535 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:97 msgid "Filelist status &bars" msgstr "S&tavový řádek seznamu souborů" -#: ../../locales/../src/interface/edithandler.cpp:1238 +#: ../../locales/../src/interface/edithandler.cpp:1084 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:130 -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:372 -#: ../../locales/../src/interface/search.cpp:379 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../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 msgid "Filename" msgstr "Název souboru" -#: resources.h:528 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:66 msgid "Filename &filters..." msgstr "Filtry &názvů souborů..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3143 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 #, 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:1921 +#: ../../locales/../src/interface/RemoteListView.cpp:1589 msgid "Filename invalid" msgstr "Neplatný název souboru" -#: ../../locales/../src/interface/RemoteListView.cpp:3206 -msgid "" -"Filename may not contain any of the following characters: / \\ : * ? \" < > |" -msgstr "" -"Název souboru nesmí obsahovat žádný z těchto znaků: / \\ : * ? \" < > |" - -#: ../../locales/../src/interface/asyncrequestqueue.cpp:268 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Název souboru nezměněn" -#: resources.h:318 resources.h:984 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Název souboru:" -#: ../../locales/../src/interface/LocalListView.cpp:1366 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Názvy souborů nesmí obsahovat žádný z těchto znaků: / * ? < > |" -#: ../../locales/../src/interface/LocalListView.cpp:1341 +#: ../../locales/../src/interface/file_utils.cpp:293 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "" "Názvy souborů nesmí obsahovat žádný z těchto znaků: / \\ : * ? \" < > |" -#: resources.h:346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 msgid "Files currently being edited" msgstr "Právě upravované soubory" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:135 -#: ../../locales/../src/interface/LocalListView.cpp:278 -#: ../../locales/../src/interface/RemoteListView.cpp:373 -#: ../../locales/../src/interface/search.cpp:381 +#: ../../locales/../src/interface/LocalListView.cpp:275 +#: ../../locales/../src/interface/RemoteListView.cpp:374 +#: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" msgstr "Velikost souboru" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:129 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:105 msgid "Filesize format" msgstr "Formát velikosti" -#: ../../locales/../src/interface/LocalListView.cpp:279 -#: ../../locales/../src/interface/RemoteListView.cpp:374 -#: ../../locales/../src/interface/search.cpp:382 +#: ../../locales/../src/interface/LocalListView.cpp:276 +#: ../../locales/../src/interface/RemoteListView.cpp:375 +#: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" msgstr "Typ souboru" -#: resources.h:968 -#: ../../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 "Přidružení podle typu souboru" -#: resources.h:236 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "Filtr platí pro:" -#: resources.h:841 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 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:358 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Filtr s tímto názvem již existuje" -#: resources.h:232 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1292 msgid "Filter out items matching all of the following" msgstr "Odfiltrovat položky splňující všechny následující podmínky" -#: resources.h:233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1293 msgid "Filter out items matching any of the following" msgstr "Odfiltrovat položky splňující některé následující podmínky" -#: resources.h:234 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1294 msgid "Filter out items matching none of the following" msgstr "Odfiltrovat položky nesplňující žádné následující podmínky" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:353 +#: ../../locales/../src/interface/filter.cpp:409 msgid "Filter set already exists" msgstr "Sada filtrů s tímto názvem již existuje" -#: resources.h:1023 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 msgid "Filter the directory listings" msgstr "Filtrovat výpisy složek" -#: ../../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 "Ověření filtru se nezdařilo" -#: resources.h:10 resources.h:39 -msgid "Fingerprint (MD5):" -msgstr "Otisk (MD5):" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 +msgid "Find &files" +msgstr "Hledat s&oubory" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 +msgid "Find d&irectories" +msgstr "Hledat s&ložky" -#: resources.h:11 resources.h:40 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" msgstr "Otisk (SHA-1):" -#: resources.h:190 resources.h:203 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 +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:" msgstr "Otisk:" -#: ../../locales/../src/interface/netconfwizard.cpp:42 +#: ../../locales/../src/interface/netconfwizard.cpp:58 msgid "Firewall and router configuration wizard" msgstr "Průvodce nastavením firewallu a routeru" -#: resources.h:752 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:70 msgid "" "For more detailed information about what these options do, please run the " "network configuration wizard." @@ -3921,11 +4151,11 @@ "Pro podrobnější informace o těchto nastaveních, spusťte průvodce nastavením " "sítě." -#: resources.h:729 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:313 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:215 +#: ../../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." @@ -3933,70 +4163,96 @@ "Pro tuto relaci bude použito výchozí nastavení, změny nastavení nebudou " "uloženy." -#: resources.h:119 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "Vynutit &UTF-8" -#: resources.h:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:199 msgid "Force showing &hidden files" msgstr "Vynutit zobrazování &skrytých souborů" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:644 msgid "Force showing hidden files" msgstr "Vynutit zobrazování skrytých souborů" -#: resources.h:796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:493 msgid "Format specifications:" msgstr "Specifikace formátu:" -#: resources.h:966 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2008 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." -#: resources.h:480 +#. @translator: Two examples: Found new nightly 2014-04-03\n, Found new release 3.9.0.1\n +#: ../../locales/../src/interface/updater.cpp:646 +#, c-format +msgid "Found new %s %s\n" +msgstr "Nalezena nová %s %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Další dokumentace" -#: resources.h:88 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:86 msgid "General" msgstr "Základní" -#: ../../locales/../src/engine/proxy.cpp:426 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "General SOCKS server failure" msgstr "Nastala chyba všeobecného SOCKS serveru" -#: resources.h:814 -#: ../../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 "Všeobecná proxy" -#: resources.h:718 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Získat externí IP adresu z následujícího URL:" -#: resources.h:481 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Získat pomoc" -#: ../../locales/../src/interface/filter.cpp:365 -#: ../../locales/../src/interface/filter.cpp:426 +#: ../../locales/../src/interface/filter.cpp:353 +#: ../../locales/../src/interface/filter.cpp:409 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:258 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Globální oblíbené položky" -#: resources.h:176 +#: ../../locales/../src/engine/tlssocket.cpp:210 +#, c-format +msgid "GnuTLS error %d" +msgstr "Chyba GnuTLS %d" + +#: ../../locales/../src/engine/tlssocket.cpp:212 +#, c-format +msgid "GnuTLS error %d in %s" +msgstr "Chyba GnuTLS %d v %s" + +#: ../../locales/../src/engine/tlssocket.cpp:206 +#, c-format +msgid "GnuTLS error %d in %s: %s" +msgstr "Chyba GnuTLS %d v %s: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:204 +#, c-format +msgid "GnuTLS error %d: %s" +msgstr "Chyba GnuTLS %d: %s" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:716 msgid "GnuTLS:" msgstr "GnuTLS:" -#: resources.h:148 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:436 msgid "Group permissions" msgstr "Oprávnění skupiny" -#: resources.h:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:358 msgid "H&igh" msgstr "&Vysoká" @@ -4004,7 +4260,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP přes TLS" -#: resources.h:351 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Hash:" @@ -4012,13 +4268,14 @@ msgid "Hidden" msgstr "Skrytý" -#: resources.h:839 ../../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:905 +#: ../../locales/../src/interface/queue.cpp:992 msgid "High" msgstr "Vysoká" -#: ../../locales/../src/interface/queue.cpp:926 -#: ../../locales/../src/interface/queue.cpp:1013 +#: ../../locales/../src/interface/queue.cpp:907 +#: ../../locales/../src/interface/queue.cpp:994 msgid "Highest" msgstr "Nejvyšší" @@ -4026,47 +4283,57 @@ 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." -#: 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 "" "Podržením klávesy SHIFT se stav filtrů bude na obou stranách přepínat " "současně." -#: resources.h:167 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:621 msgid "Homepage:" msgstr "Domovská stránka:" -#: resources.h:353 +#: ../../locales/../src/engine/socket.cpp:1076 +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:" -#: resources.h:196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "Nesouhlasí hostitelský klíč" -#: ../../locales/../src/engine/server.cpp:168 +#: ../../locales/../src/engine/server.cpp:157 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:435 +#: ../../locales/../src/engine/proxy.cpp:493 msgid "Host unreachable" msgstr "Hostitel je nedostupný" -#: 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 "Hostitel:" -#: resources.h:106 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "hodin," -#: resources.h:915 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "IS&O 8601 (příklad: 15:47)" -#: resources.h:756 +#: ../../locales/../src/engine/proxy.cpp:141 +msgid "IPv6 addresses are not supported with SOCKS4 proxy" +msgstr "SOCKS4 proxy nepodporuje adresy IPv6" + +#: ../../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 " @@ -4075,11 +4342,11 @@ "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é." -#: resources.h:1000 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level." msgstr "Při hlášení chyb uveďte protokoly s nastavenou úrovní „Podrobné“." -#: resources.h:709 +#: ../../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 " @@ -4091,7 +4358,7 @@ "nastaven a měli byste vyzkoušet aktivní režim. Režim přenosu lze pro " "jednotlivé servery nastavit ve správci míst." -#: resources.h:704 +#: ../../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." @@ -4099,7 +4366,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." -#: 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." @@ -4107,7 +4374,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:554 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4115,24 +4382,24 @@ "Pokud problém potrvá, některý router nebo firewall blokuje aplikaci " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:563 +#: ../../locales/../src/interface/netconfwizard.cpp:579 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í." -#: resources.h:989 +#: ../../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 "" "Pokud velikost souboru protokolu dosáhne omezené velikosti, bude přejmenován " "přidáním „.1“ za konec názvu souboru (což případně přepíše starší soubory " "protokolu) a vytvoří se nový soubor." -#: resources.h:466 +#: ../../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." @@ -4140,17 +4407,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:624 +#: ../../locales/../src/interface/netconfwizard.cpp:640 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:582 +#: ../../locales/../src/interface/netconfwizard.cpp:598 msgid "If this problem stays, please contact your router manufacturer." msgstr "Pokud problém potrvá, kontaktujte výrobce routeru." -#: resources.h:289 resources.h:878 +#: ../../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 " @@ -4160,7 +4428,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." -#: resources.h:939 +#: ../../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." @@ -4168,11 +4436,11 @@ "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." -#: resources.h:954 -msgid "If you change the language, you should restart FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1882 +msgid "If you change the language, you need to restart FileZilla." msgstr "Po změně jazyka je třeba aplikaci FileZilla restartovat." -#: resources.h:735 +#: ../../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." @@ -4180,21 +4448,21 @@ "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:1262 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "If you close FileZilla, your changes will be lost." msgstr "Pokud ukončíte aplikaci FileZilla, vaše změny budou ztraceny." -#: resources.h:854 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1127 msgid "" "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "Pokud zadáte chybně typy souborů, mohou se pak při přenosu poškodit." -#: resources.h:736 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 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." -#: resources.h:768 +#: ../../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." @@ -4202,7 +4470,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:569 +#: ../../locales/../src/interface/netconfwizard.cpp:585 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 " @@ -4212,7 +4480,7 @@ "nebo firewall nemusí být správně nastaven. Zkuste nastavit pasivní režim a " "obraťte se na správce serveru pro pomoc." -#: resources.h:695 +#: ../../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." @@ -4220,7 +4488,7 @@ "Pokud dokončíte tohoto průvodce a závěrečný test uspěje, vaše firewally a " "routery by měli být správně nastaveny." -#: resources.h:731 +#: ../../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." @@ -4228,7 +4496,7 @@ "Pokud používáte firewall, ubezpečte se, že má aplikace FileZilla povoleno " "přijmout připojení na všech zadaných portech." -#: resources.h:730 +#: ../../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." @@ -4236,31 +4504,31 @@ "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:595 +#: ../../locales/../src/interface/netconfwizard.cpp:611 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:96 +#: ../../locales/../src/interface/import.cpp:87 msgid "Import data from older version" msgstr "Importovat data ze starší verze" -#: resources.h:308 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Nastavení importu" -#: ../../locales/../src/interface/import.cpp:81 -#: ../../locales/../src/interface/import.cpp:84 +#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:76 msgid "Import successful" msgstr "Úspěšný import" -#: ../../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 "Přidružení typu souboru není správně uzavřeno do uvozovek." -#: resources.h:723 +#: ../../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." @@ -4268,7 +4536,7 @@ "V aktivním režimu musí aplikace FileZilla poslouchat na portu pro datové " "přenosy. Musíte zadat, které porty bude aplikace FileZilla používat." -#: resources.h:725 +#: ../../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." @@ -4276,15 +4544,8 @@ "V případě, že máte router, musíte přesměrovat všechny dostupné porty, neboť " "aplikace FileZilla nemá vliv na to, jaký port operační systém vybere." -#: resources.h:265 -msgid "" -"In case you prefer automatic updates, you can enable automatic update checks " -"in the settings dialog." -msgstr "" -"Pokud máte raději automatické aktualizace, můžete povolit kontrolu nových " -"verzí v dialogu nastavení." - -#: resources.h:713 resources.h:777 +#: ../../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." @@ -4292,7 +4553,7 @@ "Abyste mohli použít aktivní režim, musí aplikace FileZilla znát vaši externí " "IP adresu." -#: resources.h:698 +#: ../../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 " @@ -4302,7 +4563,7 @@ "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:1093 +#: ../../locales/../src/engine/tlssocket.cpp:1117 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4310,44 +4571,63 @@ "Neúplný řetězec, vrchní certifikát není certifikát certifikační autority " "podepsaný sám sebou" -#: ../../locales/../src/interface/QueueView.cpp:1047 +#: ../../locales/../src/interface/queue.cpp:322 msgid "Incorrect password" msgstr "Nesprávné heslo" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772 +#: ../../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 "" +"Nelze získat informaci o poslední verzi aplikace FileZilla. Opakujte akci " +"později." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 msgid "Initializing TLS..." msgstr "Inicializace TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Málo bezpečný algoritmus!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 msgid "Insecure server, it does not support FTP over TLS." msgstr "Nezabezpečený server, nepodporuje FTP přes 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:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:184 msgid "Interactive" msgstr "Interaktivní" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:126 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:102 msgid "Interface" msgstr "Uživatelské rozhraní" +#: ../../locales/../src/engine/socket.cpp:1062 +msgid "Interrupted by signal" +msgstr "Přerušeno signálem" + #: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/QueueView.cpp:1004 -#: ../../locales/../src/interface/QueueView.cpp:1583 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Interrupted by user" msgstr "Přerušeno uživatelem" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 msgid "Invalid Content-Length" msgstr "Neplatný Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:623 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 msgid "Invalid HTTP Response" msgstr "Neplatná HTTP odpověď" -#: ../../locales/../src/engine/ControlSocket.cpp:539 -#: ../../locales/../src/engine/ControlSocket.cpp:585 +#: ../../locales/../src/engine/socket.cpp:1050 +msgid "Invalid argument passed" +msgstr "Předán neplatný argument" + +#: ../../locales/../src/engine/ControlSocket.cpp:455 +#: ../../locales/../src/engine/ControlSocket.cpp:511 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4355,118 +4635,126 @@ "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:896 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 msgid "Invalid chunk size" msgstr "Neplatná velikost části" -#: ../../locales/../src/interface/netconfwizard.cpp:353 -#: ../../locales/../src/interface/netconfwizard.cpp:363 -#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:369 +#: ../../locales/../src/interface/netconfwizard.cpp:379 +#: ../../locales/../src/interface/netconfwizard.cpp:388 msgid "Invalid data received" msgstr "Přijata neplatná data" -#: ../../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 "Neplatné datum" -#: ../../locales/../src/interface/LocalListView.cpp:1341 -#: ../../locales/../src/interface/LocalListView.cpp:1366 -#: ../../locales/../src/interface/RemoteListView.cpp:3206 +#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: ../../locales/../src/engine/server.cpp:175 +#: ../../locales/../src/engine/server.cpp:162 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:104 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Neplatný vstup" #: ../../locales/../src/engine/server.cpp:63 -#: ../../locales/../src/engine/server.cpp:196 -#: ../../locales/../src/engine/server.cpp:208 +#: ../../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 "Zadán neplatný port. Port musí mít hodnotu mezi 1 a 65535." -#: ../../locales/../src/engine/server.cpp:93 -#: ../../locales/../src/interface/quickconnectbar.cpp:125 +#: ../../locales/../src/engine/server.cpp:91 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 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 "" "Zadán neplatný protokol. Platné protokoly jsou:\n" -"ftp:// pro běžné FTP,\n" +"ftp:// pro běžné FTP s možností šifrování,\n" "sftp:// pro protokol přenosu souborů přes SSH,\n" "ftps:// pro FTP přes TLS (implicitní) a\n" "ftpes:// pro FTP přes TLS (explicitní)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4433 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 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:699 +#: ../../locales/../src/interface/search.cpp:402 msgid "Invalid regular expression in search conditions." msgstr "Neplatný regulární výraz v podmínkách hledání." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 msgid "Invalid response code" msgstr "Neplatný kód odpovědi" -#: ../../locales/../src/interface/search.cpp:693 +#: ../../locales/../src/interface/search.cpp:397 #, c-format msgid "Invalid search conditions: %s" msgstr "Neplatné podmínky vyhledávání: %s" # Nepřesné -#: ../../locales/../src/interface/sitemanager.cpp:416 -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:453 -#: ../../locales/../src/interface/sitemanager.cpp:460 -#: ../../locales/../src/interface/sitemanager.cpp:467 -#: ../../locales/../src/interface/sitemanager.cpp:484 -#: ../../locales/../src/interface/sitemanager.cpp:555 -#: ../../locales/../src/interface/sitemanager.cpp:732 -#: ../../locales/../src/interface/sitemanager.cpp:739 -#: ../../locales/../src/interface/sitemanager.cpp:817 -#: ../../locales/../src/interface/sitemanager.cpp:824 +#: ../../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 "Neplatná cesta místa" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" msgstr "Neplatná velikost v podmínce" -#: ../../locales/../src/engine/server.cpp:138 +#: ../../locales/../src/engine/server.cpp:132 msgid "Invalid username given." msgstr "Neplatné uživatelské jméno." -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/engine/socket.cpp:1083 +msgid "Invalid value for ai_flags" +msgstr "Neplatná hodnota ai_flags" + +#: ../../locales/../src/engine/socket.cpp:1085 +msgid "Invalid value for hints" +msgstr "Neplatný hodnota pro hinty" + +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "Země soudní pravomoci:" -#: ../../locales/../src/interface/verifycertdialog.cpp:194 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Místo soudní pravomoci:" -#: ../../locales/../src/interface/verifycertdialog.cpp:193 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Stát nebo oblast soudní pravomoci:" -#: resources.h:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "Složky vždy na začátku výpisu" -#: ../../locales/../src/interface/Mainfrm.cpp:680 +#: ../../locales/../src/interface/Mainfrm.cpp:648 msgid "" "Keep in mind that not all servers support this feature and may return " "incorrect listings if this option is enabled. Although FileZilla performs " @@ -4477,109 +4765,130 @@ "snaží server otestovat, zda tuto vlastnost podporuje, ale tyto testy mohou " "selhat." -#: resources.h:348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "Výměna klíče" -#: resources.h:21 resources.h:50 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:200 msgid "Key exchange:" msgstr "Výměna klíče:" -#: resources.h:621 +#: ../../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 "Soubor s klíčem" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "Ne&jnižší" -#: resources.h:952 -#: ../../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 "Jazyk" -#: ../../locales/../src/interface/Mainfrm.cpp:1568 +#: ../../locales/../src/interface/Mainfrm.cpp:1440 msgid "Language changed" msgstr "Jazyk změněn" -#: ../../locales/../src/interface/LocalListView.cpp:280 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/LocalListView.cpp:277 +#: ../../locales/../src/interface/RemoteListView.cpp:376 +#: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" msgstr "Poslední změna" -#: resources.h:881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Rozložení" -#: resources.h:827 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Maximální &počet souběžných stahování:" -#: resources.h:829 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Ma&ximální počet souběžných odesílání:" -#: resources.h:772 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:264 msgid "Limit local ports" msgstr "Omezit místní porty" -#: resources.h:986 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "Omezit velikost souboru protokolu" -#: resources.h:987 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "Omezení:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 msgid "Line length exceeded" msgstr "Překročena délka řádku" -#: resources.h:178 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:736 msgid "Linked against" msgstr "Sestaveno s" -#: ../../locales/../src/interface/netconfwizard.cpp:267 +#: ../../locales/../src/interface/netconfwizard.cpp:283 msgid "Listen socket closed" msgstr "Naslouchající soket uzavřen" -#: ../../locales/../src/engine/logging.cpp:220 -#: ../../locales/../src/interface/StatusView.cpp:309 -#: ../../locales/../src/interface/StatusView.cpp:377 +#: ../../locales/../src/engine/logging.cpp:117 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "Výpis:" -#: resources.h:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:294 msgid "Lo&west available port:" msgstr "&Nejnižší využitelný port:" -#: ../../locales/../src/interface/edithandler.cpp:1286 -#: ../../locales/../src/interface/edithandler.cpp:1540 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Místní" -#: resources.h:375 +#: ../../locales/../src/engine/socket.cpp:1047 +msgid "Local address in use" +msgstr "Místní adresa se již používá" + +#: ../../locales/../src/engine/socket.cpp:1075 +msgid "Local endpoint has been closed" +msgstr "Byl uzavřen koncový bod" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Místní soubor" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:312 msgid "Local file does not exist." msgstr "Místní soubor neexistuje." -#: ../../locales/../src/interface/manual_transfer.cpp:323 +#: ../../locales/../src/interface/updater.cpp:370 +#: ../../locales/../src/interface/updater.cpp:462 +#, c-format +msgid "Local file is %s\n" +msgstr "Místní soubor je %s\n" + +#: ../../locales/../src/interface/manual_transfer.cpp:308 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:369 +#: ../../locales/../src/interface/manual_transfer.cpp:349 msgid "Local file is not a valid filename." msgstr "Místní soubor není platný název souboru." -#: resources.h:214 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Místní filtry:" -#: ../../locales/../src/interface/viewheader.cpp:360 +#: ../../locales/../src/interface/viewheader.cpp:334 msgid "Local site:" msgstr "Místní složka:" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Lokalita:" @@ -4587,16 +4896,12 @@ msgid "Log file" msgstr "Soubor protokolu" -#: resources.h:262 -msgid "Log of update check:" -msgstr "Protokol kontroly aktualizací:" - -#: resources.h:981 -#: ../../locales/../src/interface/settings/settingsdialog.cpp:140 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Protokol činností" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4605,7 +4910,7 @@ "podporovat UTF-8. Nelze se vrátit k místní znakové sadě, protože je použito " "proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4613,7 +4918,7 @@ "Ú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:861 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 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á " @@ -4633,13 +4938,13 @@ "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:919 -#: ../../locales/../src/interface/queue.cpp:1006 +#: ../../locales/../src/interface/queue.cpp:900 +#: ../../locales/../src/interface/queue.cpp:987 msgid "Low" msgstr "Nízká" -#: ../../locales/../src/interface/queue.cpp:917 -#: ../../locales/../src/interface/queue.cpp:1004 +#: ../../locales/../src/interface/queue.cpp:898 +#: ../../locales/../src/interface/queue.cpp:985 msgid "Lowest" msgstr "Nejnižší" @@ -4647,179 +4952,205 @@ 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." -#: 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/xmlfunctions.cpp:44 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:827 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:839 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:854 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:896 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 #, c-format msgid "Malformed chunk data: %s" msgstr "Chybně vytvořený blok dat: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:772 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 #, c-format msgid "Malformed header: %s" msgstr "Chybně vytvořená hlavička: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:593 +#: ../../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ů" -#: resources.h:405 ../../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: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 msgid "Manual transfer" msgstr "Ruční přenos" -#: resources.h:445 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Splňují všechny následující podmínky" -#: resources.h:446 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Splňují některé následující podmínky" -#: resources.h:447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Nesplňují žádné následující podmínky" -#: resources.h:825 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "&Maximální počet souběžných přenosů:" -#: ../../locales/../src/interface/Mainfrm.cpp:378 -#: ../../locales/../src/interface/Mainfrm.cpp:1896 +#: ../../locales/../src/engine/socket.cpp:1089 +msgid "Memory allocation failure" +msgstr "Selhala alokace paměti" + +#: ../../locales/../src/interface/Mainfrm.cpp:387 +#: ../../locales/../src/interface/Mainfrm.cpp:1750 msgid "Message log" msgstr "Protokol zpráv" -#: resources.h:892 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" msgstr "Pozice protokolu zpráv" -#: resources.h:988 +#: ../../locales/../src/engine/socket.cpp:1072 +msgid "Message too large" +msgstr "Příliš velká zpráva" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2177 msgid "MiB" msgstr "MiB" -#: resources.h:107 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "minut" -#: resources.h:369 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Posunout &dolů" -#: resources.h:368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Posunout &nahoru" -#: ../../locales/../src/interface/LocalTreeView.cpp:1061 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Computer" msgstr "Počítač" -#: ../../locales/../src/interface/LocalTreeView.cpp:1051 +#: ../../locales/../src/interface/LocalTreeView.cpp:967 msgid "My Documents" msgstr "Dokumenty" -#: ../../locales/../src/interface/sitemanager.cpp:288 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:718 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:720 +#: ../../locales/../src/interface/sitemanager.cpp:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Místa" -#: ../../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 "Neznámý" -#: resources.h:410 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Název" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:713 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" msgstr "Název již existuje" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 -#: ../../locales/../src/interface/sitemanager.cpp:756 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 +#: ../../locales/../src/interface/sitemanager.cpp:695 msgid "Name of bookmark already exists." msgstr "Název oblíbené položky již existuje." -#: resources.h:130 resources.h:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:282 msgid "Name:" msgstr "Název:" -#: ../../locales/../src/interface/filteredit.cpp:349 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 +msgid "Natural sort" +msgstr "Přirozené řazení" + +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Musíte zadat název filtru" -#: ../../locales/../src/interface/search.cpp:683 +#: ../../locales/../src/interface/search.cpp:388 msgid "Need to enter valid remote path" msgstr "Musíte zadat platnou vzdálenou cestu" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Musíte určit znakovou sadu" -#: ../../locales/../src/engine/proxy.cpp:432 +#: ../../locales/../src/engine/socket.cpp:1093 +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 +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 msgid "Network unreachable" msgstr "Síť je nedostupná" -#: resources.h:970 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" msgstr "Nikdy" -#: resources.h:83 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" msgstr "Nová &složka" -#: resources.h:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" msgstr "&Nová záložka" -#: resources.h:84 resources.h:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "&Nová položka" -#: resources.h:406 ../../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: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:756 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125 +#: ../../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:2180 msgid "New bookmark" msgstr "Nová oblíbená položka" -#: ../../locales/../src/interface/LocalTreeView.cpp:1179 -#: ../../locales/../src/interface/RemoteListView.cpp:1641 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1290 +#: ../../locales/../src/interface/LocalTreeView.cpp:1126 +#: ../../locales/../src/interface/RemoteListView.cpp:1310 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 msgid "New directory" msgstr "Nová složka" -#: ../../locales/../src/interface/welcome_dialog.cpp:52 +#: ../../locales/../src/interface/welcome_dialog.cpp:51 #, c-format msgid "New features and improvements in %s" msgstr "Nové funkce a zlepšení v %s" @@ -4828,37 +5159,41 @@ msgid "New filter" msgstr "Nový filtr" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" msgstr "Nová složka" -#: ../../locales/../src/interface/sitemanager.cpp:621 -#: ../../locales/../src/interface/sitemanager.cpp:635 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 msgid "New site" msgstr "Nové místo" -#: resources.h:890 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Vedle fronty přenosů" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 msgid "No" msgstr "ne" +#: ../../locales/../src/engine/socket.cpp:1091 +msgid "No address associated with nodename" +msgstr "S nodename není přidružena žádná adresa" + #: ../../locales/../src/interface/export.cpp:26 msgid "No category to export selected" msgstr "Nebyla vybrána žádná skupina pro export" -#: ../../locales/../src/interface/QueueView.cpp:2290 +#: ../../locales/../src/interface/QueueView.cpp:2123 msgid "No command given, aborting." msgstr "Nebyl zadán žádný příkaz, probíhá přerušení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3944 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 msgid "No external IP address set, trying default." msgstr "Nezadána žádná externí IP adresa, zkouší se výchozí." -#: ../../locales/../src/interface/edithandler.cpp:1227 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Aktuálně nejsou upravovány žádné soubory." @@ -4866,108 +5201,119 @@ msgid "No filter name given" msgstr "Nezadán název filtru" -#: ../../locales/../src/engine/server.cpp:78 -#: ../../locales/../src/engine/server.cpp:189 -#: ../../locales/../src/engine/server.cpp:218 +#: ../../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 "Nezadán hostitel, zadejte ho prosím." -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 msgid "No images available" msgstr "Žádné ikony nejsou dostupné" -#: ../../locales/../src/interface/QueueView.cpp:3156 +#: ../../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:350 -#: ../../locales/../src/interface/filter.cpp:419 +#: ../../locales/../src/interface/filter.cpp:339 +#: ../../locales/../src/interface/filter.cpp:403 msgid "No name for the filterset given." msgstr "Nezadán název sady filtrů." -#: resources.h:441 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "K tomuto typu souboru není přidružen žádný program" -#: resources.h:431 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2909 #, 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/interface/search.cpp:541 +#: ../../locales/../src/engine/socket.cpp:1067 +msgid "No route to host" +msgstr "K hostiteli nevede žádná cesta" + +#: ../../locales/../src/interface/search.cpp:255 msgid "No search results" msgstr "Žádné výsledky hledání" -#: ../../locales/../src/interface/sitemanager.cpp:254 -#: ../../locales/../src/interface/sitemanager.cpp:266 -#: ../../locales/../src/interface/sitemanager.cpp:297 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Žádná místa nejsou dostupná" -#: ../../locales/../src/engine/proxy.cpp:400 +#: ../../locales/../src/engine/proxy.cpp:461 msgid "No supported SOCKS5 auth method" msgstr "Nepodporovaná metoda ověřování SOCK5" -#: ../../locales/../src/interface/loginmanager.cpp:104 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "No username given." msgstr "Nezadáno uživatelské jméno." -#: resources.h:946 resources.h:951 -#: ../../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/verifycertdialog.cpp:61 msgid "None" msgstr "Nic" -#: resources.h:385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Žádný nevybrán" -#: resources.h:838 ../../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:1087 +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 msgid "Normal" msgstr "Normální" -#: ../../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 "" -"Některé položky nelze znovu zařadit do fronty pro zobrazení nebo úpravu." +#: ../../locales/../src/interface/queueview_failed.cpp:312 +#: ../../locales/../src/interface/queueview_failed.cpp:337 +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:199 -#: ../../locales/../src/interface/state.cpp:527 +#: ../../locales/../src/interface/state.cpp:179 +#: ../../locales/../src/interface/state.cpp:482 msgid "Not connected" msgstr "Nepřipojen" -#: ../../locales/../src/interface/RemoteListView.cpp:2378 +#: ../../locales/../src/interface/RemoteListView.cpp:2021 msgid "Not connected to any server" msgstr "Nepřipojen k žádnému serveru" -#: ../../locales/../src/interface/Mainfrm.cpp:566 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Nepřipojen k žádnému serveru." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Nepřipojen." -#: ../../locales/../src/interface/Mainfrm.cpp:678 +#: ../../locales/../src/engine/socket.cpp:1108 +msgid "Not initialized, need to call WSAStartup" +msgstr "Neinicializováno, je potřeba zavolat WSAStartup" + +#: ../../locales/../src/interface/Mainfrm.cpp:646 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." -#: resources.h:806 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:595 msgid "Note: This only works with plain, unencrypted FTP connections." msgstr "Poznámka: Toto funguje jen s nešifrovaným FTP připojením." -#: resources.h:823 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 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í." -#: resources.h:925 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "Počet desetinných míst:" @@ -4975,21 +5321,44 @@ msgid "Number of retries has to be between 0 and 99." msgstr "Počet pokusů musí být mezi 0 a 99." -#: resources.h:344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 msgid "O&pen file" msgstr "O&tevřít soubor" -#: 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:290 resources.h:299 -#: resources.h:306 resources.h:314 resources.h:337 resources.h:345 -#: resources.h:364 resources.h:370 resources.h:403 resources.h:417 -#: resources.h:439 resources.h:462 resources.h:471 resources.h:485 -#: resources.h:498 resources.h:505 resources.h:749 +#: ../../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" -#: resources.h:705 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +msgid "OS version:" +msgstr "Verze 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." @@ -4997,196 +5366,244 @@ "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:888 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 msgid "Once" msgstr "Jedenkrát" -#: resources.h:971 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +msgid "Once a day" +msgstr "Jednou denně" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" msgstr "Jednou týdně" -#: resources.h:674 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 +msgid "Only use plain FTP (insecure)" +msgstr "Použít pouze obyčejné FTP (nezabezpečené)" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Otevřít složku v systémovém správci souborů" -#: resources.h:1002 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 msgid "Open the Site Manager" msgstr "Otevřít správce míst" -#: resources.h:1003 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 msgid "Open the Site Manager." msgstr "Otevřít správce míst." -#: resources.h:1004 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 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." -#: resources.h:582 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:256 msgid "Open the file." msgstr "Otevřít soubor." -#: resources.h:525 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:55 msgid "Open the settings dialog of FileZilla" msgstr "Otevře dialog s nastavením aplikace FileZilla" -#: resources.h:320 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Otevřeno jako:" -#: ../../locales/../src/interface/LocalListView.cpp:2037 -#: ../../locales/../src/interface/LocalListView.cpp:2082 -#: ../../locales/../src/interface/LocalListView.cpp:2169 -#: ../../locales/../src/interface/LocalListView.cpp:2182 -#: ../../locales/../src/interface/RemoteListView.cpp:2678 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/LocalListView.cpp:1707 msgid "Opening failed" msgstr "Otevření se nezdařilo" -#: resources.h:513 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:18 msgid "Opens a new tab" msgstr "Otevře novou záložku" -#: resources.h:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:9 msgid "Opens the Site Manager" msgstr "Otevře správce míst" -#: resources.h:1024 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 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í." -#: resources.h:182 -msgid "Operating system" -msgstr "Operační systém" - -#: ../../locales/../src/interface/FileZilla.cpp:310 -msgid "Operating system problem detected" -msgstr "Zjištěn problém operačního systému" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Operační systém:" + +#: ../../locales/../src/engine/socket.cpp:1058 +msgid "Operation already in progress" +msgstr "Operace již probíhá" + +#: ../../locales/../src/engine/socket.cpp:1049 +msgid "Operation in progress" +msgstr "Operace probíhá" + +#: ../../locales/../src/engine/socket.cpp:1070 +msgid "Operation not supported" +msgstr "Nepodporovaná operace" -#: ../../locales/../src/interface/verifycertdialog.cpp:180 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Organizace:" -#: ../../locales/../src/interface/verifycertdialog.cpp:202 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Další možnosti SFTP" + +#: ../../locales/../src/engine/socket.cpp:1103 +msgid "Other system error" +msgstr "Jiná systémová chyba" + +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Jiné:" -#: resources.h:751 +#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1054 +msgid "Out of memory" +msgstr "Nedostatek paměti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:63 msgid "Overview" msgstr "Přehled" -#: resources.h:69 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite &if source newer" msgstr "Přepsat, pokud je zdroj &novější" -#: resources.h:271 resources.h:281 resources.h:861 resources.h:870 +#: ../../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 "Přepsat soubor" -#: resources.h:273 resources.h:283 resources.h:863 resources.h:872 +#: ../../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 "Přepsat, pokud se liší velikost" -#: resources.h:274 resources.h:284 resources.h:864 resources.h:873 +#: ../../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 "Přepsat, pokud se liší velikost nebo je zdrojový soubor novější" -#: resources.h:272 resources.h:282 resources.h:862 resources.h:871 +#: ../../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 "Přepsat, pokud je zdrojový soubor novější" -#: resources.h:70 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:148 msgid "Overwrite if &different size" msgstr "Přepsat, pokud se liší &velikost" -#: resources.h:71 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:155 msgid "Overwrite if different si&ze or source newer" msgstr "Přepsat, pokud se liší v&elikost nebo je zdroj novější" -#: resources.h:144 +#: ../../locales/../src/interface/updater.cpp:218 +#, c-format +msgid "Own build type: %s\n" +msgstr "Vlastní typ sestavení: %s\n" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:402 msgid "Owner permissions" msgstr "Oprávnění vlastníka" -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/RemoteListView.cpp:378 +#: ../../locales/../src/interface/search.cpp:114 msgid "Owner/Group" msgstr "Vlastník / Skupina" -#: resources.h:896 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1361 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í" -#: resources.h:803 resources.h:819 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/settings.xrc:555 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "P&roxy hostitel:" -#: ../../locales/../src/interface/netconfwizard.cpp:488 +#: ../../locales/../src/interface/netconfwizard.cpp:504 msgid "PORT command tainted by router or firewall." msgstr "Příkaz PORT poškozen routerem nebo firewallem." -#: resources.h:765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:202 msgid "Pa&ssive (recommended)" msgstr "&Pasivní (doporučeno)" -#: ../../locales/../src/interface/updatewizard.cpp:332 -msgid "Package" -msgstr "Balík" - -#: ../../locales/../src/interface/Mainfrm.cpp:2551 +#: ../../locales/../src/interface/Mainfrm.cpp:2320 msgid "Parameter not a valid URL" msgstr "Parametr není platná URL" -#: resources.h:95 resources.h:394 resources.h:743 +#: ../../locales/../src/interface/updater.cpp:542 +#, 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 msgid "Pass&word:" msgstr "Hes&lo:" -#: resources.h:701 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" msgstr "Pasivní (doporučeno)" -#: resources.h:785 -#: ../../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 "Pasivní režim" -#: ../../locales/../src/interface/netconfwizard.cpp:588 -#: ../../locales/../src/interface/netconfwizard.cpp:601 -#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:628 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/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 msgid "Password required" msgstr "Heslo je vyžadováno" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:380 +#: ../../locales/../src/interface/search.cpp:109 msgid "Path" msgstr "Cesta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3231 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 #, 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:2502 +#: ../../locales/../src/interface/Mainfrm.cpp:2278 msgid "Path not found:" msgstr "Cesta nenalezena:" -#: resources.h:412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Cesty" -#: ../../locales/../src/interface/edithandler.cpp:1265 -#: ../../locales/../src/interface/edithandler.cpp:1408 -#: ../../locales/../src/interface/edithandler.cpp:1507 -#: ../../locales/../src/interface/edithandler.cpp:1520 +#: ../../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 "Čeká na odstranění" @@ -5194,24 +5611,21 @@ msgid "Permission" msgstr "Oprávnění" -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:384 +#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1055 +msgid "Permission denied" +msgstr "Přístup byl odepřen." + +#: ../../locales/../src/interface/RemoteListView.cpp:377 +#: ../../locales/../src/interface/search.cpp:113 msgid "Permissions" msgstr "Oprávnění" -#: resources.h:181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:765 msgid "Platform:" -msgstr "Platforma:" - -#: resources.h:261 -msgid "" -"Please check https://filezilla-project.org/ for the most recent version of " -"FileZilla." -msgstr "" -"Podívejte se na https://filezilla-project.org/ pro získání nejnovější verze " -"aplikace FileZilla." +msgstr "Typ systému:" -#: ../../locales/../src/interface/netconfwizard.cpp:553 +#: ../../locales/../src/interface/netconfwizard.cpp:569 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5219,16 +5633,7 @@ "Ověřte na stránce https://filezilla-project.org/probe.php, že server běží a " "znovu pečlivě zkontrolujte svá nastavení." -#: ../../locales/../src/interface/updatewizard.cpp:1091 -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 "" -"Zkontrolujte správce balíčků ve svém systému zda neobsahuje novější balíček " -"nebo navštivte https://filezilla-project.org/ a stáhněte si zdrojový kód " -"aplikace FileZilla." - -#: resources.h:707 +#: ../../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." @@ -5236,11 +5641,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:623 +#: ../../locales/../src/interface/netconfwizard.cpp:639 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:562 +#: ../../locales/../src/interface/netconfwizard.cpp:578 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5248,20 +5653,20 @@ "Ubezpečte se, že vaše připojení k Internetu je stabilní a znovu zkontrolujte " "svá nastavení." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:72 msgid "Please enter a custom date format." msgstr "Zadejte vlastní formát data." -#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:82 msgid "Please enter a custom time format." msgstr "Zadejte vlastní formát času." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736 +#: ../../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 "Zadejte datum ve formátu RRRR-MM-DD, například 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." @@ -5275,7 +5680,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Zadejte nový název pro kopii filtru." -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:389 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Zadejte nový název pro sadu filtrů „%s“" @@ -5284,28 +5689,28 @@ msgid "Please enter a new name for the filter." msgstr "Zadejte nový název pro filtr." -#: ../../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 "Jako počet souběžných stahování zadejte číslo mezi 0 a 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 "Jako počet souběžných odesílání zadejte číslo mezi 0 a 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 "Jako počet souběžných přenosů zadejte číslo mezi 1 a 10." -#: resources.h:127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 msgid "Please enter a password for this server:" msgstr "Zadejte heslo pro tento server:" -#: ../../locales/../src/interface/QueueView.cpp:2279 +#: ../../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" @@ -5318,34 +5723,34 @@ #: ../../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 "" -"Zadejte časový limit mezi 5 a 9999 sekundami nebo 0 pokud nechcete časový " +"Zadejte časový limit mezi 10 a 9999 sekundami, nebo 0 pokud nechcete časový " "limit používat." -#: ../../locales/../src/interface/filter.cpp:343 +#: ../../locales/../src/interface/filter.cpp:333 msgid "Please enter a unique name for this filter set" msgstr "Zadejte jedinečný název pro tuto sadu filtrů" -#: resources.h:128 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 msgid "Please enter a username for this server:" msgstr "Zadejte uživatelské jméno pro tento server:" -#: ../../locales/../src/interface/netconfwizard.cpp:182 +#: ../../locales/../src/interface/netconfwizard.cpp:198 msgid "Please enter a valid portrange." msgstr "Zadejte platný rozsah portů." -#: ../../locales/../src/interface/netconfwizard.cpp:161 +#: ../../locales/../src/interface/netconfwizard.cpp:177 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: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 "Limit pro odesílání na server zadejte větší nebo roven 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5353,27 +5758,27 @@ "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:1187 -#: ../../locales/../src/interface/LocalTreeView.cpp:1176 -#: ../../locales/../src/interface/RemoteListView.cpp:1627 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1276 +#: ../../locales/../src/interface/LocalListView.cpp:897 +#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1297 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 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:3181 +#: ../../locales/../src/interface/RemoteListView.cpp:2619 msgid "Please enter the name of the file which should be created:" msgstr "Zadejte název souboru, který má být vytvořen:" -#: resources.h:129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 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:142 +#: ../../locales/../src/interface/netconfwizard.cpp:158 msgid "Please enter your external IP address" msgstr "Zadejte svou externí IP adresu" -#: ../../locales/../src/interface/netconfwizard.cpp:593 -#: ../../locales/../src/interface/netconfwizard.cpp:606 +#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:622 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 " @@ -5383,7 +5788,7 @@ "aktivního režimu. Pokud máte adresu dynamickou nebo svou externí adresu " "neznáte, využijte možnost externího rozpoznání." -#: resources.h:694 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:16 msgid "" "Please follow the instructions carefully, as wrong configuration will " "prevent successful FTP connections." @@ -5391,7 +5796,7 @@ "Dodržujte pečlivě pokyny, neboť chybné nastavení znemožní úspěšně navazovat " "FTP připojení." -#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5400,12 +5805,12 @@ "ujistěte se, že jste správně zadali adresu stránky, která zjistí vaši " "externí IP adresu." -#: ../../locales/../src/interface/FileZilla.cpp:262 +#: ../../locales/../src/interface/FileZilla.cpp:136 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:594 +#: ../../locales/../src/interface/netconfwizard.cpp:610 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 " @@ -5417,7 +5822,7 @@ "přesměrování portů. Nespouštějte router v tzv. „DMZ režimu“ nebo „herním " "režimu“." -#: resources.h:708 +#: ../../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 " @@ -5429,7 +5834,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:728 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5437,7 +5842,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." -#: resources.h:762 +#: ../../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." @@ -5445,24 +5850,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." -#: resources.h:912 resources.h:918 -#, no-c-format -msgid "" -"Please read https://wiki.filezilla-project.org/Date_and_Time_formatting for " -"details" -msgstr "" -"Podrobné informace najdete na adrese: https://wiki.filezilla-project.org/" -"Date_and_Time_formatting" - -#: resources.h:257 -msgid "" -"Please retry downloading the update. Possible reasons if the problem " -"persists (listed in order of decreasing probability):" -msgstr "" -"Zkuste znovu stáhnout aktualizaci. Možné důvody trvání problému (v sestupném " -"pořadí dle pravděpodobnosti):" - -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5472,42 +5860,42 @@ "případě, že náhle zaznamenáte problémy se servery, které před tím fungovaly " "správně." -#: resources.h:467 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Vyberte akci:" -#: resources.h:313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." msgstr "Vyberte kategorie, které chcete importovat." -#: resources.h:696 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:34 msgid "Please select the default transfer mode you would like to use." msgstr "Vyberte výchozí režim přenosu, který chcete použít." -#: ../../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 "Vyberte nové atributy složky „%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 "Vyberte nové atributy souboru „%s“." -#: ../../locales/../src/interface/chmoddialog.cpp:54 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Vyberte nové atributy pro vybrané složky." -#: ../../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 "Vyberte nové atributy pro vybrané soubory a složky." -#: ../../locales/../src/interface/chmoddialog.cpp:43 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "Vyberte nové atributy pro vybrané soubory." -#: ../../locales/../src/interface/netconfwizard.cpp:581 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5521,42 +5909,37 @@ "„DMZ režimu“ nebo „herním režimu“. Možnosti typu inspekce protokolu nebo pro " "protokol specifické „záplaty“ musí být vypnuty." -#: resources.h:264 -msgid "" -"Please visit https://filezilla-project.org/ for more information about " -"FileZilla." -msgstr "" -"Navštivte https://filezilla-project.org/ pro získání více informací o aplikaci " -"FileZilla." - -#: ../../locales/../src/interface/updatewizard.cpp:1089 -#: ../../locales/../src/interface/updatewizard.cpp:1111 -msgid "" -"Please visit https://filezilla-project.org/ to download the most recent " -"version." -msgstr "" -"Navštivte https://filezilla-project.org/ pro získání nejnovější verze aplikace " -"FileZilla." +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +msgid "Positio&n of the message log:" +msgstr "&Pozice protokolu zpráv:" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "PSČ:" -#: ../../locales/../src/interface/sitemanager.cpp:287 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +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 +msgid "Preallocation" +msgstr "Předběžné přidělení" + +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 msgid "Predefined Sites" msgstr "Předdefinovaná místa" -#: ../../locales/../src/interface/Mainfrm.cpp:727 +#: ../../locales/../src/interface/Mainfrm.cpp:685 msgid "Preserving file timestamps" msgstr "Zachovávání času souborů" -#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223 +#: ../../locales/../src/interface/settings/optionspage_themes.cpp:206 msgid "Preview:" msgstr "Náhled:" -#: ../../locales/../src/engine/tlssocket.cpp:1119 +#: ../../locales/../src/engine/tlssocket.cpp:1134 msgid "Primary connection and data connection certificates don't match." msgstr "Certifikáty primárního a datového připojení si neodpovídají." @@ -5568,15 +5951,15 @@ msgid "Print version information to stdout and exit" msgstr "Vypsat informace o verzi na standardní výstup a ukončit" -#: resources.h:935 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Složky na začátku nebo na konci výpisu dle řazení (výchozí)" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Priority" msgstr "Priorita" -#: resources.h:979 +#: ../../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." @@ -5584,135 +5967,159 @@ "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." -#: resources.h:809 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:629 msgid "Private &keys:" msgstr "Soukromé &klíče:" -#: resources.h:91 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "Pro&tokol:" -#: resources.h:805 resources.h:822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:578 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" msgstr "Proxy h&eslo:" -#: resources.h:543 resources.h:612 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:129 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:338 msgid "Process &Queue" msgstr "Zpracuj &frontu" -#: resources.h:19 resources.h:48 +#: ../../locales/../src/engine/socket.cpp:1051 +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 +#, c-format +msgid "Processed %s in %s." +msgstr "Zpracováno %s v %s." + +#: ../../locales/../src/engine/socket.cpp:1056 +msgid "Protocol not supported" +msgstr "Protokol není podporován" + +#: ../../locales/../src/engine/socket.cpp:1110 +msgid "Protocol not supported on given socket type" +msgstr "Protokol není podporovám daným typem soketu." + +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:190 msgid "Protocol:" msgstr "Protokol:" -#: resources.h:820 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "Proxy &port:" -#: resources.h:804 resources.h:821 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:568 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" msgstr "Proxy &uživatel:" -#: ../../locales/../src/engine/proxy.cpp:411 +#: ../../locales/../src/engine/proxy.cpp:471 msgid "Proxy authentication failed" msgstr "Ověření s proxy se nezdařilo" -#: ../../locales/../src/engine/transfersocket.cpp:131 -#: ../../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 "Uvítání s proxy serverem se nezdařilo: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4425 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 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:305 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Odpověď proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:384 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Proxy request failed: %s" msgstr "Požadavek proxy se nezdařil: %s" -#: ../../locales/../src/engine/proxy.cpp:476 +#: ../../locales/../src/engine/proxy.cpp:536 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:4458 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy je nastavena, avšak proxy hostitel nebo port není platný" -#: resources.h:807 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:616 msgid "Public Key Authentication" msgstr "Autorizace veřejných klíčů" -#: resources.h:8 resources.h:37 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 msgid "Public key algorithm:" msgstr "Algoritmus veřejného klíče:" -#: resources.h:152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 msgid "Public permissions" msgstr "Oprávnění ostatních" -#: ../../locales/../src/interface/QueueView.cpp:3212 +#: ../../locales/../src/interface/QueueView.cpp:3057 msgid "Queue has been fully processed" msgstr "Fronta byla zpracována" -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Fronta: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:392 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Fronta: %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 "Fronta: prázdná" -#: ../../locales/../src/interface/QueueView.cpp:455 +#: ../../locales/../src/interface/QueueView.cpp:434 msgid "Queued files" msgstr "Soubory ve frontě" -#: resources.h:459 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Řazení do fronty:" -#: resources.h:628 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "R&eboot system" msgstr "&Restartovat systém" -#: resources.h:540 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "&Vzdálený strom složek" -#: resources.h:644 resources.h:648 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" msgstr "V&ybrané soubory obnovit a znovu zařadit do fronty" -#: ../../locales/../src/interface/Mainfrm.cpp:594 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Přímý FTP příkaz" -#: resources.h:149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:443 msgid "Re&ad" msgstr "Čt&ení" -#: resources.h:587 resources.h:603 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:272 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Re&fresh" msgstr "&Aktualizovat" -#: resources.h:73 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 msgid "Re&name" msgstr "Pře&jmenovat" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5720,7 +6127,7 @@ "Spusťte znovu průvodce a pozorně zkontrolujte nastavení a nastavte podle " "toho všechny routery a brány firewall." -#: resources.h:153 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:477 msgid "Rea&d" msgstr "Čte&ní" @@ -5728,12 +6135,12 @@ msgid "Read-only" msgstr "Jen pro čtení" -#: ../../locales/../src/interface/Mainfrm.cpp:1120 +#: ../../locales/../src/interface/Mainfrm.cpp:1022 msgid "Really cancel current operation?" msgstr "Opravdu si přejete přerušit aktuální operaci?" -#: ../../locales/../src/interface/RemoteListView.cpp:1717 -#: ../../locales/../src/interface/search.cpp:1026 +#: ../../locales/../src/interface/RemoteListView.cpp:1386 +#: ../../locales/../src/interface/search.cpp:761 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5742,8 +6149,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:1715 -#: ../../locales/../src/interface/search.cpp:1024 +#: ../../locales/../src/interface/RemoteListView.cpp:1384 +#: ../../locales/../src/interface/search.cpp:759 #, c-format msgid "Really delete %d file from the server?" msgid_plural "Really delete %d files from the server?" @@ -5751,48 +6158,66 @@ msgstr[1] "Opravdu chcete ze serveru odstranit %d soubory?" msgstr[2] "Opravdu chcete ze serveru odstranit %d souborů?" -#: ../../locales/../src/interface/RemoteListView.cpp:1722 -#: ../../locales/../src/interface/search.cpp:1031 +#: ../../locales/../src/interface/RemoteListView.cpp:1391 +#: ../../locales/../src/interface/search.cpp:765 #, 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:1125 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 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:134 +#: ../../locales/../src/engine/local_filesys.cpp:129 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:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Reason" msgstr "Důvod" -#: ../../locales/../src/interface/QueueView.cpp:3219 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Reboot now" msgstr "Restartovat nyní" -#: resources.h:158 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "&Rekurzivně použít pro vnořené složky" -#: ../../locales/../src/engine/directorylistingparser.cpp:3118 +#: ../../locales/../src/engine/tlssocket.cpp:223 +#, 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 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:2121 -#: ../../locales/../src/engine/directorylistingparser.cpp:2136 +#: ../../locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 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:1004 -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1037 +#: ../../locales/../src/interface/netconfwizard.cpp:1007 +#: ../../locales/../src/interface/netconfwizard.cpp:1016 +#: ../../locales/../src/interface/netconfwizard.cpp:1039 msgid "Received data tainted" msgstr "Přijatá data poškozena" +#: ../../locales/../src/interface/updater.cpp:521 +msgid "Received invalid character in version information" +msgstr "V informaci o verzi byly přijaty neplatné znaky" + +#: ../../locales/../src/engine/tlssocket.cpp:226 +#, 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 +msgid "Received version information is too large" +msgstr "Přijatá informace o verzi je příliš velká" + #: ../../locales/../src/interface/clearprivatedata.cpp:77 msgid "" "Reconnect information cannot be cleared while connected to a server.\n" @@ -5801,54 +6226,77 @@ "Informaci pro znovuspojení nelze vymazat dokud jste připojeni na server.\n" "Pokud budete pokračovat, spojení se serverem bude odpojeno." -#: resources.h:763 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:184 msgid "Reconnection settings" msgstr "Nastavení znovuspojení" -#: resources.h:1021 resources.h:1022 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 msgid "Reconnects to the last used server" msgstr "Znovu se připojí k naposledy použitému serveru" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:715 -msgid "Redirection to invalid address" -msgstr "Přesměrování na neplatnou adresu" +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +msgid "Recursively adding files to queue." +msgstr "Přidávám rekurzivně soubory do fronty." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +msgid "Recursively changing permissions." +msgstr "Rekurzivní změna oprávnění." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +msgid "Recursively deleting files and directories." +msgstr "Mažu rekurzivně soubory a složky." + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#, c-format +msgid "Redirection to invalid or unsupported URI: %s" +msgstr "Přesměrování na neplatné nebo nepodporované URI: %s" -#: resources.h:1013 resources.h:1014 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 +#, 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 msgid "Refresh the file and folder lists" msgstr "Aktualizuje seznam souborů a složek" -#: resources.h:507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Pamatovat si hesla?" -#: ../../locales/../src/interface/edithandler.cpp:1249 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" msgstr "Vzdálený" -#: ../../locales/../src/engine/tlssocket.cpp:908 +#: ../../locales/../src/engine/tlssocket.cpp:852 msgid "Remote certificate not trusted." msgstr "Nedůvěryhodný vzdálený certifikát." -#: resources.h:378 ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Remote file" msgstr "Vzdálený soubor" -#: resources.h:451 ../../locales/../src/interface/search.cpp:677 -#: ../../locales/../src/interface/search.cpp:683 -#: ../../locales/../src/interface/search.cpp:693 -#: ../../locales/../src/interface/search.cpp:699 +#: ../../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 msgid "Remote file search" msgstr "Hledání vzdálených souborů" -#: resources.h:217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Vzdálené filtry:" -#: ../../locales/../src/interface/edithandler.cpp:1240 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Vzdálená složka" -#: ../../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 " @@ -5857,7 +6305,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:1094 +#: ../../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 " @@ -5866,100 +6314,130 @@ "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: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:1117 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:350 +#: ../../locales/../src/interface/manual_transfer.cpp:331 msgid "Remote path could not be parsed." msgstr "Vzdálenou cestu nelze analyzovat." -#: resources.h:456 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Zpracování vzdálené cesty:" -#: resources.h:324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Vzdálená složka:" -#: ../../locales/../src/interface/viewheader.cpp:560 +#: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" msgstr "Vzdálená složka:" -#: resources.h:641 resources.h:645 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" msgstr "Odebrat &všechny" -#: resources.h:643 resources.h:647 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" msgstr "&Odebrat vybrané" -#: resources.h:276 resources.h:286 resources.h:866 resources.h:875 -#: ../../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 "Přejmenovat soubor" -#: resources.h:659 resources.h:680 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Rename selected directory" msgstr "Přejmenovat vybranou složku" -#: resources.h:591 resources.h:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:281 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Rename selected files and directories" msgstr "Přejmenovat vybrané soubory a složky" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3577 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Přejmenování „%s“ na „%s“" -#: resources.h:483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Hlášení chyb a požadavků na funkce" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:514 +#: ../../locales/../src/engine/proxy.cpp:375 +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 +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 +msgid "Request rejected or failed" +msgstr "Požadavek odmítnut nebo se nezdařil" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "Vyžadovat explicitní FTP přes TLS" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:515 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "Vyžadovat implicitní FTP přes TLS" -#: resources.h:646 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" msgstr "Obnovit a &zařadit vše znovu do fronty" -#: ../../locales/../src/engine/ControlSocket.cpp:1160 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:497 +#: ../../locales/../src/engine/socket.cpp:1098 +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/interface/updatewizard.cpp:1179 -msgid "Resolving hostname" -msgstr "Zjišťování názvu hostitele" - -#: ../../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/interface/updatewizard.cpp:555 +#: ../../locales/../src/engine/socket.cpp:1057 +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 msgid "Response:" msgstr "Odpověď:" -#: resources.h:450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Výsledky:" -#: resources.h:275 resources.h:285 resources.h:865 resources.h:874 +#: ../../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 "Navázat soubor" -#: resources.h:880 +#: ../../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." @@ -5967,117 +6445,132 @@ "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:1313 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#, 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 msgid "Retrieving directory listing..." msgstr "Načítání výpisu složky..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962 -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 +#: ../../locales/../src/interface/netconfwizard.cpp:720 #, c-format msgid "Retrieving external IP address from %s" msgstr "Načítání externí IP adresy z %s" -#: ../../locales/../src/engine/tlssocket.cpp:1100 -msgid "Root certificate is not trusted" -msgstr "Kořenový certifikát není důvěryhodný" - -#: resources.h:518 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:34 msgid "S&how files currently being edited..." msgstr "Z&obrazit aktuálně upravované soubory..." -#: resources.h:897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1366 msgid "S&how the Site Manager on startup" msgstr "P&o spuštění zobrazit správce míst" -#: resources.h:629 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:401 msgid "S&hutdown system" msgstr "&Vypnout počítač" -#: resources.h:448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Zastavit" -#: resources.h:534 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:405 +msgid "S&uspend system" +msgstr "Převést počítač do režimu spán&ku" + +#: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" msgstr "&Synchronizované procházení" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:121 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:97 msgid "SFTP" msgstr "SFTP" -#: resources.h:177 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:729 +msgid "SOC&KS 4" +msgstr "SOC&KS 4" + +#: ../../locales/../src/engine/proxy.cpp:154 +#, 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 msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:858 msgid "Save settings?" msgstr "Uložit nastavení?" -#: ../../locales/../src/interface/manual_transfer.cpp:455 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/manual_transfer.cpp:436 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 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:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:438 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 msgid "Saving of passwords has been disabled by you." msgstr "Zakázali jste ukládání hesel." -#: ../../locales/../src/interface/QueueView.cpp:1826 +#: ../../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:1828 +#: ../../locales/../src/interface/QueueView.cpp:1712 msgid "Scanning for files to upload" msgstr "Vyhledávání souborů pro odeslání na server" -#: resources.h:444 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Podmínky hledání:" -#: resources.h:442 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Prohledávaná &složka:" -#: resources.h:1029 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." msgstr "Rekurzivně hledat soubory." -#: resources.h:559 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" msgstr "Hledat soubory na serveru" -#: ../../locales/../src/interface/statusbar.cpp:531 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Bezpečnostní informace" -#: ../../locales/../src/interface/netconfwizard.cpp:564 -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Podívejte se: https://wiki.filezilla-project.org/Network_Configuration" -#: resources.h:386 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "&Vybrat server" -#: resources.h:748 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:12 msgid "Select &page:" msgstr "&Vybrat stránku:" -#: resources.h:900 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Vybrat téma" -#: resources.h:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1167 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:1710 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168 +#: ../../locales/../src/interface/edithandler.cpp:1531 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Vybrat výchozí editor" @@ -6097,11 +6590,7 @@ "Vyberte výchozí akci pokud cílový soubor již existuje, pouze pro aktuálně " "vybrané soubory ve frontě." -#: ../../locales/../src/interface/updatewizard.cpp:336 -msgid "Select download location for package" -msgstr "Vyberte místo, kam se má balíček stáhnout" - -#: ../../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 "Vyberete soubor obsahující soukromý klíč" @@ -6110,6 +6599,7 @@ msgstr "Vyberte soubor pro exportovaná data" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1489 msgid "Select file for exported queue" msgstr "Vyberte soubor pro exportovanou frontu" @@ -6118,44 +6608,43 @@ msgstr "Vyberte soubor pro exportovaná nastavení" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 msgid "Select file for exported sites" msgstr "Vyberte soubor pro exportované místa" -#: ../../locales/../src/interface/import.cpp:15 +#: ../../locales/../src/interface/import.cpp:16 msgid "Select file to import settings from" msgstr "Vyber soubor pro import nastavení" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:241 msgid "Select file to upload" msgstr "Vyberte soubor k odeslání" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Vyberte název souboru pro převedený soubor klíče" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +msgid "Select filename for converted key file" +msgstr "Vyberte název pro převedený soubor klíče" -#: resources.h:432 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Vyberte, jak by se tyto soubory měly otevírat." -#: ../../locales/../src/interface/search.cpp:806 +#: ../../locales/../src/interface/search.cpp:507 msgid "Select target download directory" msgstr "Vyberte cílovou složku stahování" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:237 msgid "Select target filename" msgstr "Vyberte název cílového souboru" -#: resources.h:302 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" msgstr "Vyberte kategorie pro export:" -#: resources.h:293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 msgid "Select the private data you would like to delete." msgstr "Vyberte soukromé údaje, které chcete odstranit." -#: ../../locales/../src/interface/search.cpp:773 +#: ../../locales/../src/interface/search.cpp:475 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6163,7 +6652,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:51 +#: ../../locales/../src/interface/filelist_statusbar.cpp:37 #, c-format msgid "Selected %d directory." msgid_plural "Selected %d directories." @@ -6171,7 +6660,7 @@ msgstr[1] "Vybrány %d složky." msgstr[2] "Vybráno %d složek." -#: ../../locales/../src/interface/search.cpp:771 +#: ../../locales/../src/interface/search.cpp:473 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6180,7 +6669,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: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" @@ -6188,7 +6677,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: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" @@ -6196,48 +6685,49 @@ 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:778 +#: ../../locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %s and %s for transfer." msgstr "Vybráno %s a %s pro přenos." -#: ../../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 "Vybráno %s a %s. Celková velikost: %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 "Vybráno %s a %s. Celková velikost: Nejméně %s" -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/edithandler.cpp:1730 -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188 +#: ../../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 "Vybraný editor neexistuje." -#: resources.h:331 ../../locales/../src/interface/LocalListView.cpp:2066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "Vybraný soubor je již upravován" -#: ../../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 "Vybraný soubor je již načten" -#: ../../locales/../src/interface/RemoteListView.cpp:2710 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "Vybraný soubor je již otevřen" -#: ../../locales/../src/interface/RemoteListView.cpp:2738 +#: ../../locales/../src/interface/edithandler.cpp:1720 msgid "Selected file is still being edited" msgstr "Vybraný soubor je stále upravován" -#: ../../locales/../src/interface/filter.cpp:310 +#: ../../locales/../src/interface/filter.cpp:303 msgid "Selected filter only works for local files." msgstr "Vybraný filtr funguje pouze pro místní soubory." -#: ../../locales/../src/interface/menu_bar.cpp:313 +#: ../../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." @@ -6246,48 +6736,48 @@ "serveru.\n" "Pro tento server použijte oblíbenou položku platnou jen pro určité místo." -#: ../../locales/../src/engine/engineprivate.cpp:281 +#: ../../locales/../src/engine/engineprivate.cpp:291 msgid "Selected port usually in use by a different protocol." msgstr "Vybraný port obvykle používá jiný protokol." -#: resources.h:770 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:240 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" -#: resources.h:561 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:196 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:4540 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 msgid "Sending keep-alive command" msgstr "Posílání příkazu pro udržení připojení" -#: 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:251 msgid "Serial number:" msgstr "Sériové číslo:" -#: resources.h:99 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "T&yp serveru:" -#: ../../locales/../src/engine/tlssocket.cpp:786 +#: ../../locales/../src/engine/tlssocket.cpp:741 msgid "Server did not properly shut down TLS connection" msgstr "Server správně neukončil připojení TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 msgid "Server does not support non-ASCII characters." msgstr "Server nepodporuje znaky, které nepatří do ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4364 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 #, 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:4360 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6296,15 +6786,15 @@ "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:2569 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 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:2564 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 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:4375 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6313,17 +6803,17 @@ "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:863 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 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." -#: ../../locales/../src/engine/ControlSocket.cpp:420 +#: ../../locales/../src/engine/ControlSocket.cpp:344 msgid "Server returned empty path." msgstr "Server vrátil prázdnou cestu." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6331,13 +6821,13 @@ "Server poslal další výzvu na ověření. Budete muset použít interaktivní typ " "přihlášení." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3904 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 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:3898 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6345,73 +6835,86 @@ "Server poslal pasivní odpověď s nedostupnou adresou. Použije se raději " "adresa serveru." -#: ../../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: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:521 +#: ../../locales/../src/interface/netconfwizard.cpp:517 +#: ../../locales/../src/interface/netconfwizard.cpp:526 +#: ../../locales/../src/interface/netconfwizard.cpp:537 msgid "Server sent unexpected reply." msgstr "Server poslal neočekávanou odpověď." -#: resources.h:362 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "Server na klient MAC:" -#: resources.h:360 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Šifra serveru na klienta:" -#: resources.h:391 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "T&yp serveru:" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Server/Local file" msgstr "Server nebo místní soubor" -#: resources.h:322 resources.h:384 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Server:" -#: resources.h:16 resources.h:45 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:171 msgid "Session details" msgstr "Podrobnosti relace" -#: resources.h:616 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:352 msgid "Set &Priority" msgstr "Nastavit priorit&u" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3729 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Nastavit oprávnění „%s“ na „%s“" -#: ../../locales/../src/engine/transfersocket.cpp:870 +#: ../../locales/../src/engine/transfersocket.cpp:791 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize voláno bez uvedení soketu" -#: resources.h:747 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:3 msgid "Settings" msgstr "Nastavení" -#: resources.h:1001 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Složka s nastavením:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Zob&razovat nezpracované výpisy složek" -#: resources.h:570 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." msgstr "Zobrazit &uvítací dialog..." -#: ../../locales/../src/interface/Mainfrm.cpp:2389 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "Show both directory trees and continue comparing?" msgstr "Zobrazit oba stromy složek a pokračovat v porovnávání?" -#: resources.h:640 +#: ../../locales/../src/interface/resources/xrc/update.xrc:210 +msgid "Show details" +msgstr "Zobrazit podrobnosti" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1588 +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 msgid "Shows available TLS ciphers" msgstr "Zobrazit dostupné TLS šifry" @@ -6419,71 +6922,73 @@ msgid "Shows this help dialog" msgstr "Zobrazí tuto nápovědu" -#: ../../locales/../src/interface/QueueView.cpp:3221 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "Shutdown now" msgstr "Vypnout nyní" -#: resources.h:9 resources.h:38 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 msgid "Signature algorithm:" msgstr "Algoritmus podpisu:" -#: resources.h:310 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "Položky &správce míst" -#: resources.h:80 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:7 msgid "Site Manager" msgstr "Správce míst" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 msgid "Site Manager - Cannot remember password" msgstr "Správce míst - nelze si zapamatovat heslo" -#: ../../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: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: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 "Správce míst - neplatná data" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:316 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 msgid "Site Manager already open" msgstr "Správce míst je již otevřen" -#: ../../locales/../src/interface/sitemanager.cpp:436 -#: ../../locales/../src/interface/sitemanager.cpp:453 -#: ../../locales/../src/interface/sitemanager.cpp:467 -#: ../../locales/../src/interface/sitemanager.cpp:739 -#: ../../locales/../src/interface/sitemanager.cpp:824 +#: ../../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 "Místo neexistuje." # WTF? -#: ../../locales/../src/interface/sitemanager.cpp:416 +#: ../../locales/../src/interface/sitemanager.cpp:411 msgid "Site path has to begin with 0 or 1." msgstr "Cesta má začínat nulou nebo jedničkou." -#: ../../locales/../src/interface/sitemanager.cpp:460 -#: ../../locales/../src/interface/sitemanager.cpp:555 -#: ../../locales/../src/interface/sitemanager.cpp:732 -#: ../../locales/../src/interface/sitemanager.cpp:817 +#: ../../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 "Cesta místa je poškozena." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:263 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" msgstr "Oblíbené položky platné jen pro určité místo" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:93 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../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" @@ -6493,45 +6998,68 @@ "ve Správci míst.\n" "Přidat aktuální připojení do Správce míst?" -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Size" msgstr "Velikost" -#: resources.h:919 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" msgstr "Formátování velikostí" -#: ../../locales/../src/interface/fileexistsdlg.cpp:62 -#: ../../locales/../src/interface/fileexistsdlg.cpp:68 +#: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Neznámá velikost" -#: resources.h:277 resources.h:287 resources.h:867 resources.h:876 +#: ../../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 "Přeskočit soubor" -#: ../../locales/../src/engine/ControlSocket.cpp:1232 -#: ../../locales/../src/engine/ControlSocket.cpp:1251 -#: ../../locales/../src/engine/ControlSocket.cpp:1276 -#: ../../locales/../src/engine/ControlSocket.cpp:1342 +#: ../../locales/../src/engine/ControlSocket.cpp:1152 +#: ../../locales/../src/engine/ControlSocket.cpp:1169 +#: ../../locales/../src/engine/ControlSocket.cpp:1193 +#: ../../locales/../src/engine/ControlSocket.cpp:1253 #, c-format msgid "Skipping download of %s" msgstr "Přeskočení stahování %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1236 -#: ../../locales/../src/engine/ControlSocket.cpp:1255 -#: ../../locales/../src/engine/ControlSocket.cpp:1280 -#: ../../locales/../src/engine/ControlSocket.cpp:1346 +#: ../../locales/../src/engine/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1172 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1257 #, c-format msgid "Skipping upload of %s" msgstr "Přeskočení odesílání %s na server" -#: ../../locales/../src/interface/Mainfrm.cpp:1261 +#: ../../locales/../src/engine/socket.cpp:1061 +msgid "Socket address outside address space" +msgstr "Adresa soketu je mimo adresní prostor" + +#: ../../locales/../src/engine/socket.cpp:1063 +msgid "Socket already connected" +msgstr "Soket je již připojen" + +#: ../../locales/../src/engine/socket.cpp:1071 +msgid "Socket has been shut down" +msgstr "Soket je vypnutý" + +#: ../../locales/../src/engine/socket.cpp:1068 +msgid "Socket not connected" +msgstr "Soket není připojen" + +#: ../../locales/../src/engine/socket.cpp:1111 +msgid "Socket type not supported for address family" +msgstr "Rodina adres nepodporuje daný typ soketu" + +#: ../../locales/../src/interface/Mainfrm.cpp:1157 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." -#: resources.h:710 resources.h:786 +#: ../../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." @@ -6539,27 +7067,27 @@ "Některé nesprávně nastavené vzdálené servery, které jsou za routerem, mohou " "odpovědět svou místní IP adresou." -#: resources.h:937 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" msgstr "Řadit složky mezi soubory" -#: ../../locales/../src/interface/filelistctrl.cpp:450 +#: ../../locales/../src/interface/filelistctrl.cpp:464 msgid "Sort order cannot be changed if comparing directories." msgstr "Řazení nelze změnit, pokud se porovnávají složky." -#: resources.h:933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" msgstr "Řazení" -#: resources.h:934 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "Způsob ř&azení:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:101 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 msgid "Source and path of the drop operation are identical" msgstr "Zdroj a cíl přetažení se shodují" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 msgid "Source and target file may not be the same" msgstr "Zdrojový a cílový soubor nemusí být stejný" @@ -6567,36 +7095,41 @@ msgid "Source and target of the drop operation are identical" msgstr "Zdroj a cíl přetažení se shodují" -#: resources.h:59 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Zdrojový soubor:" -#: resources.h:500 ../../locales/../src/interface/speedlimits_dialog.cpp:54 +#: ../../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 "Omezení rychlostí" -#: resources.h:831 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" msgstr "Omezení rychlostí" -#: ../../locales/../src/interface/statusbar.cpp:597 +#: ../../locales/../src/interface/statusbar.cpp:575 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:601 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "Omezení rychlostí je povoleno, kliknutím provedete změnu." -#: resources.h:976 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" -msgstr "Stabilní i betaverze" +msgstr "Stabilní i verze beta" -#: resources.h:975 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "Pouze stabilní verze" -#: resources.h:402 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 +msgid "Stable, beta and nightly versions" +msgstr "Stabilní, beta i noční verze" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Spustit přenos &okamžitě" @@ -6604,14 +7137,19 @@ msgid "Start with opened Site Manager" msgstr "Spustí s otevřeným Správcem míst" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634 +#: ../../locales/../src/interface/updater.cpp:212 +#, 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 #, c-format msgid "Starting download of %s" msgstr "Spouští se stahování %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 #, c-format msgid "Starting upload of %s" msgstr "Spouští se odesílání %s na server" @@ -6620,31 +7158,34 @@ msgid "Starts the local site in the given path" msgstr "Počáteční místní složka" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Stát nebo kraj:" -#: ../../locales/../src/interface/edithandler.cpp:1241 -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Status" msgstr "Stav" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/interface/StatusView.cpp:312 -#: ../../locales/../src/interface/StatusView.cpp:384 -#: ../../locales/../src/interface/updatewizard.cpp:549 +#: ../../locales/../src/engine/logging.cpp:109 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Stav:" -#: resources.h:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Stop and remove &all" msgstr "Vše &zastavit a odebrat" -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +msgid "Stop recursive operation" +msgstr "Zastavit rekurzivní operaci" + +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Ulice:" -#: resources.h:12 resources.h:41 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 msgid "Subject of certificate" msgstr "Předmět certifikátu" @@ -6652,11 +7193,15 @@ msgid "Successful transfers" msgstr "Úspěšné přenosy" -#: resources.h:738 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:393 msgid "Summary of test results:" msgstr "Souhrn výsledků testu:" -#: resources.h:470 +#: ../../locales/../src/interface/QueueView.cpp:3054 +msgid "Suspend now" +msgstr "Převést počítač do režimu spánku nyní" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -6664,27 +7209,29 @@ "Tato volba nemá vliv na symbolické odkazy na soubory, takové symbolické " "odkazy jsou vždy odstraněny." -#: resources.h:1028 ../../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:1080 -#: ../../locales/../src/interface/state.cpp:1089 -#: ../../locales/../src/interface/state.cpp:1096 -#: ../../locales/../src/interface/state.cpp:1107 -#: ../../locales/../src/interface/state.cpp:1114 +#: ../../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 msgid "Synchronized browsing" msgstr "Synchronizované procházení" -#: ../../locales/../src/interface/state.cpp:414 +#: ../../locales/../src/interface/state.cpp:370 msgid "Synchronized browsing has been disabled." msgstr "Synchronizované procházení bylo zakázáno." -#: ../../locales/../src/interface/quickconnectbar.cpp:88 -#: ../../locales/../src/interface/quickconnectbar.cpp:126 +#: ../../locales/../src/interface/quickconnectbar.cpp:85 +#: ../../locales/../src/interface/quickconnectbar.cpp:122 msgid "Syntax error" msgstr "Syntaktická chyba" @@ -6693,8 +7240,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2504 -#: ../../locales/../src/interface/Mainfrm.cpp:2553 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Syntax error in command line" msgstr "Syntaktická chyba v příkazovém řádku" @@ -6702,51 +7249,71 @@ msgid "System" msgstr "Systémový" -#: resources.h:536 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Podrobnosti o systému" + +#: ../../locales/../src/engine/socket.cpp:1052 +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 +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 msgid "T&oolbar" msgstr "Pan&el nástrojů" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:332 -msgid "TLS/SSL connection established, sending HTTP request" -msgstr "TLS/SSL připojení navázáno, posílání HTTP požadavku" - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414 -msgid "TLS/SSL connection established, waiting for welcome message..." -msgstr "TLS/SSL připojení navázáno, čekání na uvítací zprávu..." - -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418 -msgid "TLS/SSL connection established." -msgstr "TLS/SSL připojení navázáno." +#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +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 +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 +msgid "TLS connection established." +msgstr "TLS připojení navázáno." -#: ../../locales/../src/engine/proxy.cpp:441 +#: ../../locales/../src/engine/proxy.cpp:499 msgid "TTL expired" msgstr "TTL vypršelo" -#: resources.h:57 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:6 msgid "Target file already exists" msgstr "Cílový soubor již existuje" -#: resources.h:63 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:68 msgid "Target file:" msgstr "Cílový soubor:" -#: ../../locales/../src/interface/RemoteListView.cpp:3215 +#: ../../locales/../src/interface/RemoteListView.cpp:2635 msgid "Target filename already exists!" msgstr "Cílový název souboru již existuje!" -#: ../../locales/../src/interface/RemoteListView.cpp:1935 +#: ../../locales/../src/interface/RemoteListView.cpp:1603 msgid "Target filename already exists, really continue?" msgstr "Cílový název souboru již existuje, opravdu chcete pokračovat?" -#: resources.h:737 +#: ../../locales/../src/engine/socket.cpp:1082 +msgid "Temporary failure in name resolution" +msgstr "Dočasný nezdar při překladu názvů" + +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:370 msgid "Test results" msgstr "Výsledky testu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4381 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 msgid "Testing resume capabilities of server" msgstr "Testování schopnosti serveru navazovat soubory" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:315 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +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 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 " @@ -6763,44 +7330,61 @@ "Správce míst je otevřen v jiné instanci aplikace FileZilla 3.\n" "Pokud ho nezavřete, data nelze odstranit." -#: ../../locales/../src/interface/xmlfunctions.cpp:431 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "Dokument XML není správně strukturovaný: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:618 +#: ../../locales/../src/interface/netconfwizard.cpp:634 #, c-format msgid "The address you entered was: %s" msgstr "Zadal jste adresu: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:820 -#: ../../locales/../src/interface/sitemanager.cpp:719 +#: ../../locales/../src/engine/socket.cpp:1088 +msgid "The ai_family member is not supported" +msgstr "Nepodporovaný člen ai_family" + +#: ../../locales/../src/engine/socket.cpp:1101 +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 msgid "The bookmark could not be added." msgstr "Oblíbenou položku nelze přidat." -#: ../../locales/../src/interface/sitemanager.cpp:804 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Oblíbenou položku nelze vymazat." -#: ../../locales/../src/interface/statusbar.cpp:490 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "Toto připojení je šifrováno. Klikněte na ikonu pro podrobnosti." +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:75 +msgid "" +"The custom date format is invalid or contains unsupported format specifiers." +msgstr "" +"Vlastní formát data není platný nebo obsahuje nepodporované specifikátory " +"formátu." + #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89 msgid "The custom login sequence cannot be empty." msgstr "Vlastní přihlašovací sekvence nemůže být prázdná." -#: ../../locales/../src/engine/transfersocket.cpp:172 +#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:85 +msgid "" +"The custom time format is invalid or contains unsupported format specifiers." +msgstr "" +"Vlastní formát času není platný nebo obsahuje nepodporované specifikátory " +"formátu." + +#: ../../locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Nelze navázat datové připojení: %s" -#: resources.h:435 ../../locales/../src/interface/edithandler.cpp:1690 -#, no-c-format +#: ../../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 "Výchozí editor textových souborů nebyl nalezen." -#: resources.h:434 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "Výchozí editor textových souborů je „%s“." @@ -6811,13 +7395,13 @@ 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:160 +#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:154 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "Přípona „%s“ již v seznamu existuje" -#: ../../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" @@ -6826,9 +7410,8 @@ "Soubor %s již existuje.\n" "Zadejte nový název:" -#: ../../locales/../src/interface/LocalListView.cpp:2043 -#: ../../locales/../src/interface/LocalListView.cpp:2174 -#: ../../locales/../src/interface/RemoteListView.cpp:2684 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1699 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -6839,19 +7422,27 @@ "Přidružený program (%s) nebyl nalezen.\n" "Zkontrolujte přidružení souborů." -#: ../../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 "" +"Soubor „%s“ obsahuje klíč SSH1. Protokol SSH1 je zastaralý, aplikace " +"FileZilla podporuje pouze klíče 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 "Soubor „%s“ nelze načíst nebo se nejedná o soukromý klíč." -#: ../../locales/../src/interface/xmlfunctions.cpp:63 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, c-format msgid "The file '%s' could not be loaded." msgstr "Soubor „%s“ nelze načíst." -#: ../../locales/../src/interface/LocalListView.cpp:2037 -#: ../../locales/../src/interface/LocalListView.cpp:2169 -#: ../../locales/../src/interface/RemoteListView.cpp:2678 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1695 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6860,8 +7451,8 @@ "Soubor „%s“ nelze otevřít:\n" "Ve vašem systému není k tomuto typu souboru přidružen žádný program." -#: ../../locales/../src/interface/LocalListView.cpp:2082 -#: ../../locales/../src/interface/LocalListView.cpp:2182 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1707 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -6870,20 +7461,19 @@ "Soubor „%s“ nelze otevřít:\n" "Přidružený příkaz se nezdařil" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, 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 "" -"Soubor „%s“ není ve formátu podporovaném aplikací FileZilla.\n" -"Soubor je také chráněn heslem. Aplikace FileZilla zatím nepodporuje soubory " -"klíčů chráněné heslem.\n" -"Chcete soubor převést do podporovaného a nechráněného formátu?" +"Soubor „%s“ byl vytvořen novější verzí aplikace FileZilla.\n" +"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/settings/optionspage_connection_sftp.cpp:266 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -6892,22 +7482,11 @@ "Soubor „%s“ není ve formátu podporovaném aplikací FileZilla.\n" "Chcete soubor převést do podporovaného formátu?" -#: ../../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 "" -"Soubor „%s“ je chráněn heslem. Aplikace FileZilla zatím nepodporuje heslem " -"chráněné soubory s klíči .\n" -"Chcete soubor převést do nechráněné podoby?" - -#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150 +#: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Vybraný výchozí editor neexistuje." -#: ../../locales/../src/interface/import.cpp:95 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -6921,7 +7500,7 @@ "uživatelské jméno a heslo.\n" "Pokračovat v importu?" -#: ../../locales/../src/interface/listctrlex.cpp:759 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "The filename column can neither be hidden nor moved." msgstr "Sloupec s názvem souboru nelze skrýt nebo přesunout." @@ -6929,29 +7508,29 @@ msgid "The filename column cannot be hidden." msgstr "Sloupec s názvem souboru nelze skrýt." -#: ../../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 "Následující znak bude nahrazen: %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 "Následující znaky budou nahrazeny: %s" -#: resources.h:339 +#: ../../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í:" -#: resources.h:474 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 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:298 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 msgid "The global bookmarks could not be saved." msgstr "Globální oblíbené položky nelze uložit." -#: resources.h:999 +#: ../../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 " @@ -6964,7 +7543,17 @@ 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:275 +#: ../../locales/../src/interface/state.cpp:979 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Nelze vytvořit místní složku „%s“." + +#: ../../locales/../src/interface/state.cpp:964 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Neexistuje místní složka „%s“." + +#: ../../locales/../src/interface/state.cpp:249 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -6981,27 +7570,24 @@ "Nejnižší využitelný port musí být nižší nebo roven nejvyššímu využitelnému " "portu." -#: ../../locales/../src/interface/updatewizard.cpp:618 -msgid "" -"The most recent version has been downloaded. Click on Finish to close " -"FileZilla and to start the installation." -msgstr "" -"Nejnovější verze byla stažena. Klikněte na Dokončit pro ukončení aplikace " -"FileZilla a spuštění instalace." - -#: ../../locales/../src/interface/updatewizard.cpp:620 -msgid "" -"The most recent version has been downloaded. Please install it the same way " -"you installed this version." -msgstr "" -"Nejnovější verze byla stažena. Nainstalujte ji stejným způsobem jako jste " -"nainstalovali tuto verzi." +#: ../../locales/../src/interface/resources/xrc/update.xrc:117 +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 +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:1959 +#: ../../locales/../src/interface/QueueView.cpp:1832 msgid "The queue will not be saved." msgstr "Fronta nebude uložena." -#: ../../locales/../src/interface/state.cpp:1086 +#: ../../locales/../src/interface/state.cpp:891 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Neexistuje vzdálená složka „%s“." + +#: ../../locales/../src/interface/state.cpp:935 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7010,49 +7596,49 @@ "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:84 +#: ../../locales/../src/interface/import.cpp:76 msgid "The selected categories have been imported." msgstr "Vybrané kategorie byly importovány." -#: resources.h:309 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 msgid "" "The selected file contains importable data for the following categories:" msgstr "Z vybraného souboru lze importovat tyto údaje:" -#: resources.h:332 +#: ../../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 "Vybraný soubor je již upravován:" -#: ../../locales/../src/interface/RemoteListView.cpp:2738 +#: ../../locales/../src/interface/edithandler.cpp:1720 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/LocalListView.cpp:2049 -#: ../../locales/../src/interface/RemoteListView.cpp:2690 +#: ../../locales/../src/interface/edithandler.cpp:1626 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 "" "Vybraný soubor bude přímo spuštěn.\n" -"To může být nebezpečné a ohrozit váš systém.\n" +"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:601 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Server nelze přidat." -#: ../../locales/../src/interface/netconfwizard.cpp:574 +#: ../../locales/../src/interface/netconfwizard.cpp:590 msgid "The server sent an unexpected or unrecognized reply." msgstr "Server poslal neočekávanou nebo nerozpoznanou odpověď." -#: resources.h:116 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 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ů:" -#: 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." @@ -7060,7 +7646,7 @@ "Certifikát serveru je neznámý. Podrobně ho prozkoumejte, abyste se ujistili, " "že je server důvěryhodný." -#: 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 " @@ -7071,7 +7657,7 @@ "skutečnosti pokoušíte připojit k jinému počítači, který předstírá, že je " "daným serverem." -#: 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." @@ -7079,7 +7665,11 @@ "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/interface/import.cpp:81 +#: ../../locales/../src/engine/socket.cpp:1100 +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 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7087,15 +7677,23 @@ "Nastavení bylo importováno. Aby se všechna nastavení uplatnila, musíte " "restartovat aplikaci FileZilla." -#: ../../locales/../src/interface/QueueView.cpp:3210 +#: ../../locales/../src/engine/socket.cpp:1048 +msgid "The specified address family is not supported" +msgstr "Tato rodina adres není podporována" + +#: ../../locales/../src/engine/socket.cpp:1113 +msgid "The specified network name is no longer available" +msgstr "Uvedený síťový název již není dostupný" + +#: ../../locales/../src/interface/QueueView.cpp:3049 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:3208 +#: ../../locales/../src/interface/QueueView.cpp:3045 msgid "The system will soon shut down unless you click Cancel." msgstr "Pokud nestisknete Storno, systém bude brzy vypnut." -#: resources.h:58 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:19 msgid "" "The target file already exists.\n" "Please choose an action." @@ -7103,23 +7701,28 @@ "Cílový soubor již existuje.\n" "Prosím vyberte akci." -#: ../../locales/../src/interface/netconfwizard.cpp:852 +#: ../../locales/../src/interface/netconfwizard.cpp:858 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/settings/settingsdialog.cpp:127 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 +#, c-format +msgid "The valid backup file %s could not be restored" +msgstr "Platný záložní soubor „%s“ nelze obnovit" + +#: ../../locales/../src/interface/settings/settingsdialog.cpp:103 msgid "Themes" msgstr "Témata" -#: ../../locales/../src/interface/filter.cpp:462 +#: ../../locales/../src/interface/filter.cpp:443 msgid "This filter set cannot be removed." msgstr "Tuto sadu filtrů nelze odebrat." -#: ../../locales/../src/interface/filter.cpp:397 +#: ../../locales/../src/interface/filter.cpp:383 msgid "This filter set cannot be renamed." msgstr "Tuto sadu filtrů nelze přejmenovat." -#: ../../locales/../src/interface/netconfwizard.cpp:575 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7127,7 +7730,7 @@ "To znamená, že některý router nebo firewall nadále ruší chod aplikace " "FileZilla." -#: resources.h:715 +#: ../../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." @@ -7135,7 +7738,7 @@ "Toto funguje jen pokud nejste za routerem, jinak operační systém pouze vrátí " "vaši interní adresu." -#: resources.h:693 +#: ../../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." @@ -7143,45 +7746,42 @@ "Tento průvodce vám pomůže správně nastavit vaše routery, firewally a " "otestovat vaše nastavení." -#: ../../locales/../src/interface/queue.cpp:1225 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Time" msgstr "Čas" -#: resources.h:913 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" msgstr "Formátování času" -#: resources.h:754 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" msgstr "Časový &limit v sekundách:" -#: resources.h:757 ../../locales/../src/interface/QueueView.cpp:1049 -#: ../../locales/../src/interface/QueueView.cpp:1093 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:125 +#: ../../locales/../src/interface/queue.cpp:323 msgid "Timeout" msgstr "Časový limit" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Posun časové zóny: Server: %d sekund. Místní: %d sekund. Rozdíl: %d sekund." +msgid "Timezone offset of server is %d seconds." +msgstr "Posun časové zóny serveru je%d sekund." -#: ../../locales/../src/interface/verifycertdialog.cpp:183 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Titul:" -#: ../../locales/../src/interface/Mainfrm.cpp:2387 +#: ../../locales/../src/interface/Mainfrm.cpp:2166 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:2388 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 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." -#: resources.h:808 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:623 msgid "" "To support public key authentication, FileZilla needs to know the private " "keys to use." @@ -7189,7 +7789,7 @@ "Pro podporu autentizace pomocí veřejných klíčů potřebuje aplikace FileZilla " "znát soukromé klíče, které má použít." -#: resources.h:1025 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:75 msgid "" "Toggle directory comparison. Right-click to change comparison mode.\n" "\n" @@ -7205,7 +7805,7 @@ "Zelená: Soubor je novější než neoznačený soubor na druhé straně\n" "Červená: Rozdílná velikost" -#: resources.h:1027 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:81 msgid "" "Toggle synchronized browsing.\n" "If enabled, navigating the local directory hierarchy will also change the " @@ -7215,204 +7815,210 @@ "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." -#: resources.h:1015 resources.h:1016 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 +#: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" msgstr "Přepíná zpracování fronty přenosů" -#: resources.h:1007 resources.h:1008 +#: ../../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 "Přepíná zobrazení stromu místních složek" -#: resources.h:1005 resources.h:1006 +#: ../../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 "Přepíná zobrazení protokolu zpráv" -#: resources.h:1009 resources.h:1010 +#: ../../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 "Přepíná zobrazení stromu vzdálených složek" -#: resources.h:1011 resources.h:1012 +#: ../../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 "Přepíná zobrazení fronty přenosů" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:605 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Too long header line" msgstr "Řádek hlavičky je příliš dlouhý" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:666 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 msgid "Too many redirects" msgstr "Příliš mnoho přesměrování" -#: ../../locales/../src/engine/logging.cpp:216 -#: ../../locales/../src/interface/StatusView.cpp:306 -#: ../../locales/../src/interface/StatusView.cpp:370 +#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" msgstr "Trasování:" -#: resources.h:943 resources.h:949 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1842 msgid "Transfer" msgstr "Přenos" -#: resources.h:372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "S&měr přenosu" -#: resources.h:545 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:138 msgid "Transfer &type" msgstr "&Typ přenosu" -#: resources.h:764 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:196 msgid "Transfer Mode" msgstr "Režim přenosu" -#: resources.h:899 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Fronta přenosů" -#: resources.h:108 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 msgid "Transfer Settings" msgstr "Nastavení přenosu" -#: ../../locales/../src/engine/transfersocket.cpp:509 -#: ../../locales/../src/engine/transfersocket.cpp:533 +#: ../../locales/../src/engine/transfersocket.cpp:448 +#: ../../locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Pokus o připojení přerušen: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:637 msgid "Transferred data got tainted." msgstr "Přenesená data se poškodila." -#: ../../locales/../src/interface/QueueView.cpp:1478 -#: ../../locales/../src/interface/statuslinectrl.cpp:283 +#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Přenášení" -#: ../../locales/../src/interface/settings/settingsdialog.cpp:123 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:99 msgid "Transfers" msgstr "Přenosy" -#: ../../locales/../src/interface/QueueView.cpp:3124 -#: ../../locales/../src/interface/QueueView.cpp:3127 +#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Přenosy dokončeny" -#: resources.h:855 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1135 msgid "Treat files &without extension as ASCII file" msgstr "Považovat soubory b&ez přípony za ASCII soubory" -#: resources.h:851 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1087 msgid "Treat the &following filetypes as ASCII files:" msgstr "Považovat &následující typy souborů za ASCII soubory:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 msgid "Trust changed Hostkey:" msgstr "Důvěřovat změněnému hostitelskému klíči:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 msgid "Trust new Hostkey:" msgstr "Důvěřovat novému hostitelskému klíči:" -#: resources.h:205 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:999 msgid "Trust the new key and carry on connecting?" msgstr "Důvěřovat novému klíči a pokračovat v připojování?" -#: resources.h:27 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 msgid "Trust this certificate and carry on connecting?" msgstr "Důvěřovat tomuto certifikátu a pokračovat v připojování?" -#: resources.h:192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:888 msgid "Trust this host and carry on connecting?" msgstr "Důvěřovat tomuto hostiteli a pokračovat v připojování?" -#: resources.h:407 ../../locales/../src/interface/edithandler.cpp:1239 +#: ../../locales/../src/interface/resources/xrc/update.xrc:122 +#: ../../locales/../src/interface/resources/xrc/update.xrc:197 +msgid "Try again" +msgstr "Opakujte akci" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Typ" -#: resources.h:790 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:453 msgid "Type of FTP Proxy:" msgstr "Typ FTP proxy:" -#: resources.h:815 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" msgstr "Typ všeobecné proxy:" -#: resources.h:342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "&Odeslat na server" -#: resources.h:495 resources.h:835 -#, no-c-format +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limit o&desílání na server:" -#: resources.h:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "Používat &aplikace přidružené k typu souboru" -#: resources.h:914 -msgid "U&se system defaults" -msgstr "Použít nastavení sys&tému" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +#, fuzzy +msgid "U&se system defaults for current language" +msgstr "Po&užít výchozí systémový editor textových souborů" -#: resources.h:792 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "UŽIVATEL@&HOSTITEL" -#: ../../locales/../src/engine/proxy.cpp:450 +#: ../../locales/../src/engine/proxy.cpp:381 +#: ../../locales/../src/engine/proxy.cpp:508 #, c-format msgid "Unassigned error code %d" msgstr "Nepřiřazený chybový kód %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:182 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Jednotka:" -#: ../../locales/../src/interface/edithandler.cpp:1271 -#: ../../locales/../src/interface/edithandler.cpp:1299 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Neznámý" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 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:364 +#: ../../locales/../src/engine/proxy.cpp:429 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Neznámá verze protokolu SOCKS: %d" -#: resources.h:1 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:4 msgid "Unknown certificate" msgstr "Neznámý certifikát" -#: ../../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 "" -"Neznámá chyba při otevírání souboru. Ujistěte se, že je soubor přístupný a " -"správně strukturovaný XML dokument." - -#: resources.h:185 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Neznámý hostitelský klíč" -#: ../../locales/../src/engine/proxy.cpp:374 +#: ../../locales/../src/engine/proxy.cpp:437 #, 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:464 +#: ../../locales/../src/interface/xmlfunctions.cpp:304 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:596 -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:623 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7420,7 +8026,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:583 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -7428,135 +8034,135 @@ "Dokud se tento problém nevyřeší, nebude aktivní FTP režim pracovat a musí se " "použít pasivní." -#: ../../locales/../src/engine/tlssocket.cpp:1071 +#: ../../locales/../src/engine/tlssocket.cpp:1096 msgid "Unsupported certificate type" msgstr "Nepodporovaný typ certifikátu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:650 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 msgid "Unsupported redirect" msgstr "Nepodporované přesměrování" -#: resources.h:343 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "Odes&lat na server a vrátit úpravy" -#: ../../locales/../src/interface/updatewizard.cpp:259 -#: ../../locales/../src/interface/updatewizard.cpp:272 -msgid "Update wizard" -msgstr "Průvodce aktualizací" - -#: ../../locales/../src/interface/settings/settingsdialog.cpp:137 +#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 +#: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "Aktualizace" -#: resources.h:374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Odeslat" -#: ../../locales/../src/interface/edithandler.cpp:1262 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "Odeslání se nezdařilo" -#: ../../locales/../src/interface/statusbar.cpp:609 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Omezení odesílání: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:611 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Omezení odesílání: žádné" -#: resources.h:670 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Odeslat na server vybranou složku" -#: resources.h:576 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:242 msgid "Upload selected files and directories" msgstr "Odeslat na server vybrané soubory a složky" -#: resources.h:327 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "Odeslat tento soubor zpátky na server?" -#: resources.h:326 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "Odeslat tento soubor na server?" -#: ../../locales/../src/interface/edithandler.cpp:1256 -#: ../../locales/../src/interface/edithandler.cpp:1290 -#: ../../locales/../src/interface/edithandler.cpp:1455 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "Odesílání na server" -#: ../../locales/../src/interface/edithandler.cpp:1259 -#: ../../locales/../src/interface/edithandler.cpp:1457 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" msgstr "Odesílání na server a čekání na odstranění" -#: ../../locales/../src/interface/edithandler.cpp:1293 -#: ../../locales/../src/interface/edithandler.cpp:1459 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" msgstr "Odesílání a vrací se úpravy" -#: resources.h:120 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Použít vlas&tní znakovou sadu" -#: resources.h:958 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "&Použít vlastní editor:" -#: resources.h:433 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Použít &výchozí editor pro textové soubory" -#: resources.h:416 resources.h:422 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Použít &synchronizované procházení" -#: resources.h:118 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 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." -#: resources.h:269 resources.h:279 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "Použít výchozí akci" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 -msgid "Use plain FTP" -msgstr "Použít prosté FTP" +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 +msgid "Use explicit FTP over TLS if available" +msgstr "Použít explicitní FTP přes TLS pokud je k dispozici" -#: resources.h:382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Použít server, ke kterému jste aktuálně připojeni" -#: resources.h:383 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Použít server ze Správce míst" -#: resources.h:908 -msgid "Use system &defaults" -msgstr "Použít nastavení s&ystému" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +#, fuzzy +msgid "Use system &defaults for current language" +msgstr "Po&užít výchozí systémový editor textových souborů" -#: resources.h:716 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" msgstr "Použít tuto IP adresu:" -#: resources.h:726 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:283 msgid "Use the following port range:" msgstr "Použít následující rozsah portů:" -#: resources.h:711 +#: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:152 msgid "Use the server's external IP address instead" msgstr "Použít místo toho externí IP adresu serveru" -#: resources.h:717 resources.h:780 +#: ../../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 "" "Toto použijte, pokud jste za routerem a máte statickou externí IP adresu." -#: resources.h:720 +#: ../../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 " @@ -7567,38 +8173,27 @@ "režim. Verze aplikace FileZilla je jediná informace, která se přenáší na " "server." -#: resources.h:132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:298 msgid "User:" msgstr "Uživatelské jméno:" -#: ../../locales/../src/interface/manual_transfer.cpp:518 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037 +#: ../../locales/../src/interface/manual_transfer.cpp:494 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "Uživatelské jméno nemůže být několik mezer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4463 -#, c-format -msgid "Using proxy %s" -msgstr "Používá se proxy %s" - -#: resources.h:122 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" "Nastavení nesprávné znakové sady může vést k nekorektnímu zobrazení názvů " "souborů." -#: resources.h:242 -msgid "Using this wizard you can check for available updates to FileZilla." -msgstr "" -"Pomocí tohoto průvodce můžete zkontrolovat dostupné aktualizace aplikace " -"FileZilla." - -#: resources.h:5 resources.h:34 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 msgid "Valid from:" msgstr "Platný od:" -#: resources.h:6 resources.h:35 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 msgid "Valid to:" msgstr "Platný do:" @@ -7606,90 +8201,56 @@ msgid "Verbose log messages from wxWidgets" msgstr "Podrobné protokolování zpráv z wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1157 +#: ../../locales/../src/engine/tlssocket.cpp:1146 msgid "Verifying certificate..." msgstr "Ověřování certifikátu..." -#: resources.h:180 -msgid "Version:" -msgstr "Verze:" - -#: resources.h:840 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Velmi vysoká" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 msgid "View hidden option set, but unsupported by server" msgstr "" "Zobrazování skrytých souborů je sice povoleno, ale server ho nepodporuje" -#: resources.h:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Zobrazit/Upravit" -#: resources.h:366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Zobrazit sloupce" -#: resources.h:150 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:449 msgid "W&rite" msgstr "Zá&pis" -#: ../../locales/../src/interface/QueueView.cpp:1785 +#: ../../locales/../src/interface/QueueView.cpp:1670 msgid "Waiting" msgstr "Čekání" -#: ../../locales/../src/interface/QueueView.cpp:1381 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Waiting for browsing connection" msgstr "Čekání na připojení pro procházení" -#: ../../locales/../src/interface/QueueView.cpp:1428 +#: ../../locales/../src/interface/queue.cpp:330 msgid "Waiting for password" msgstr "Čekání na heslo" -#: ../../locales/../src/interface/statuslinectrl.cpp:277 +#: ../../locales/../src/interface/statuslinectrl.cpp:240 msgid "Waiting for transfer to be cancelled" msgstr "Čekání na zrušení přenosu" -#: ../../locales/../src/engine/engineprivate.cpp:203 +#: ../../locales/../src/engine/engineprivate.cpp:229 msgid "Waiting to retry..." msgstr "Čekání na opakování..." -#: ../../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 "" -"Upozornění!\n" -"\n" -"Chyba v systému Windows způsobuje aplikaci FileZilla problémy\n" -"\n" -"Tato chyba se vyskytuje pokud máte\n" -"- systém Windows Server 2003 nebo XP 64\n" -"- povolenou bránu firewall systému Windows\n" -"- povolenou službu brány aplikačního rozhraní\n" -"Pro podrobné informace navštivte http://support.microsoft.com/kb/931130 .\n" -"\n" -"Dokud nevypnete bránu firewall systému Windows nebo službu brány aplikačního " -"rozhraní\n" -"aplikace FileZilla překročí časový limit při přenosu velkých souborů." - -#: ../../locales/../src/interface/netconfwizard.cpp:972 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." -msgstr "Upozornění, ignorování datového připojení z chybné IP." +msgstr "Upozornění: ignorování datového připojení z chybné IP." -#: ../../locales/../src/interface/updatewizard.cpp:272 +#: ../../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,29 +8258,29 @@ "\n" "Do you really want to check for nightly builds?" msgstr "" -"Upozornění, použití vývojových verzí je na vlastní riziko.\n" +"Upozornění: použití vývojových verzí je na vlastní riziko.\n" "Pro tyto verze není poskytována žádná podpora.\n" "Vývojové verze nemusí správně fungovat a mohou dokonce poškodit váš systém.\n" "\n" "Opravdu chcete zjišťovat tyto vývojové verze?" -#: resources.h:197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Upozornění: Možné narušení bezpečnosti!" -#: resources.h:486 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Vítejte v aplikaci FileZilla" -#: resources.h:475 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Co je nového" -#: resources.h:252 +#: ../../locales/../src/interface/resources/xrc/update.xrc:61 msgid "What's new:" msgstr "Co je nového:" -#: resources.h:502 +#: ../../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." @@ -7728,7 +8289,7 @@ "novém spuštění aplikace znovu připojit, aniž byste museli opětovně zadávat " "heslo." -#: resources.h:843 +#: ../../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." @@ -7736,32 +8297,36 @@ "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." -#: resources.h:885 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 +msgid "When st&arting a new connection while already connected:" +msgstr "&Pokud se během stávajícího spojení otevírá nové" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Široká obrazovka" -#: resources.h:501 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "Chcete, aby si aplikace FileZilla pamatovala hesla?" -#: resources.h:154 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "Záp&is" -#: ../../locales/../src/interface/netconfwizard.cpp:433 -#: ../../locales/../src/interface/netconfwizard.cpp:440 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:456 msgid "Wrong external IP address" msgstr "Neplatná externí IP adresa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:827 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 msgid "Wrong line endings" msgstr "Nesprávné konce řádků" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 msgid "Yes" msgstr "Ano" -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -7769,23 +8334,24 @@ "Zdá se, že používáte hostitele, který umí pouze IPv6. Takovou situaci " "bohužel tento průvodce nepodporuje." -#: resources.h:263 -msgid "" -"You are already using the most recent version of FileZilla. Please check " -"again in future." -msgstr "" -"Používáte aktuální verzi aplikace FileZilla. Proveďte kontrolu zase v " -"budoucnu." +#: ../../locales/../src/interface/resources/xrc/update.xrc:241 +msgid "You are using the latest version of FileZilla." +msgstr "Používáte nejnovější verzi aplikace FileZilla." -#: resources.h:484 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 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 +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 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é." -#: 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." @@ -7796,7 +8362,7 @@ msgstr "" "Nelze importovat nastavení ze složky s nastavením, které se právě používá." -#: ../../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." @@ -7804,23 +8370,23 @@ "Nelze nahradit neplatný znak jiným neplatným znakem. Zadejte znak, který je " "v názvech souborů povolen." -#: ../../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 "" "Nezadal jste nový název pro soubor. Chcete raději soubor místo toho přepsat?" -#: resources.h:465 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "Vybrali jste alespoň jeden symbolický odkaz." -#: ../../locales/../src/interface/LocalListView.cpp:2016 -#: ../../locales/../src/interface/RemoteListView.cpp:2657 +#: ../../locales/../src/interface/edithandler.cpp:1587 +#: ../../locales/../src/interface/search.cpp:725 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:2136 +#: ../../locales/../src/interface/LocalListView.cpp:1665 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -7828,42 +8394,46 @@ "Vybrali jste k otevření více než 10 souborů nebo složek. Opravdu chcete " "pokračovat?" -#: ../../locales/../src/interface/manual_transfer.cpp:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:945 +#: ../../locales/../src/interface/manual_transfer.cpp:414 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Musíte zadat název hostitele." -#: ../../locales/../src/interface/search.cpp:818 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +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 msgid "You have to enter a local directory." msgstr "Musíte zadat místní složku." -#: ../../locales/../src/interface/netconfwizard.cpp:149 +#: ../../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:824 +#: ../../locales/../src/interface/search.cpp:523 msgid "You have to enter a writable local directory." msgstr "Musíte zadat zapisovatelnou místní složku." -#: ../../locales/../src/interface/manual_transfer.cpp:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047 +#: ../../locales/../src/interface/manual_transfer.cpp:505 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "Musíte zadat název účtu" -#: ../../locales/../src/interface/manual_transfer.cpp:499 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../locales/../src/interface/manual_transfer.cpp:479 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "You have to specify a user name" msgstr "Musíte zadat uživatelské jméno" -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:638 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:55 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:56 msgid "You need to enter a name for the bookmark." msgstr "Musíte zadat název záložky." @@ -7871,28 +8441,28 @@ 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:1646 +#: ../../locales/../src/interface/edithandler.cpp:1472 msgid "You need to enter a properly quoted command." msgstr "Musí být uveden správně uvozený příkaz." #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82 -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:79 msgid "You need to enter a proxy host." msgstr "Musíte zadat proxy hostitele." -#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82 +#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:88 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: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:1127 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: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:1134 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -7900,7 +8470,7 @@ "Musíte zadat místní i vzdálenou cestu, pokud chcete povolit synchronizované " "procházení pro tuto oblíbenou položku." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072 +#: ../../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." @@ -7908,23 +8478,23 @@ "Musíte zadat místní i vzdálenou cestu, pokud chcete povolit synchronizované " "procházení tohoto místa." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:302 msgid "You need to specify a local file." msgstr "Musíte zadat místní soubor." -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:319 msgid "You need to specify a remote file." msgstr "Musíte zadat vzdálený soubor." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:325 msgid "You need to specify a remote path." msgstr "Musíte zadat vzdálenou složku." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:296 msgid "You need to specify a server." msgstr "Musíte zadat název serveru." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -7932,6 +8502,10 @@ "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 +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 msgid "after" msgstr "po" @@ -7945,7 +8519,7 @@ msgstr "začíná na" #: ../../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 "bajtů" @@ -7953,6 +8527,10 @@ msgid "contains" msgstr "obsahuje" +#: ../../locales/../src/interface/updater.cpp:216 +msgid "custom" +msgstr "vlastní" + #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "does not contain" msgstr "neobsahuje" @@ -7971,19 +8549,19 @@ msgid "equals" msgstr "se rovná" -#: ../../locales/../src/interface/filelistctrl.cpp:511 -#: ../../locales/../src/interface/filelistctrl.cpp:530 -#: ../../locales/../src/interface/filelistctrl.cpp:555 -#: ../../locales/../src/interface/filelistctrl.cpp:571 +#: ../../locales/../src/interface/filelistctrl.cpp:529 +#: ../../locales/../src/interface/filelistctrl.cpp:548 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:591 msgid "file" msgstr "soubor" -#: ../../locales/../src/interface/edithandler.cpp:88 +#: ../../locales/../src/interface/edithandler.cpp:97 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:203 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -7993,11 +8571,15 @@ "Ujistěte se, zda existuje tento spustitelný soubor ve stejné složce jako " "spouštěcí soubor aplikace FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +msgid "fzsftp belongs to a different version of FileZilla" +msgstr "fzsftp patří k jiné verzi aplikace FileZilla" + +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 msgid "fzsftp could not be started" msgstr "Nelze spustit fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1109 +#: ../../locales/../src/engine/tlssocket.cpp:1125 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers nevrátil žádné certifikáty" @@ -8017,6 +8599,10 @@ msgid "group writeable" msgstr "zapisovatelný skupinou" +#: ../../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 "je" @@ -8049,10 +8635,11 @@ msgid "owner writeable" msgstr "zapisovatelný vlastníkem" -#: ../../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: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 msgid "unknown" msgstr "neznámý" @@ -8068,10 +8655,301 @@ msgid "world writeable" msgstr "zapisovatelný pro všechny" -#: resources.h:175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "U&se system defaults" +#~ msgstr "Použít nastavení sys&tému" + +#~ msgid "Use system &defaults" +#~ msgstr "Použít nastavení s&ystému" + +#~ msgid "%s bytes" +#~ msgstr "%s bajtů" + +#~ msgid "%s bytes (%s/s)" +#~ msgstr "%s bajtů (%s/s)" + +#~ msgid "&Crash" +#~ msgstr "&Spadnout" + +#~ msgid "&Finish" +#~ msgstr "&Dokončit" + +#~ msgid ", %H:%M:%S left" +#~ msgstr ", %H.%M:%S zbývá" + +#~ msgid ", --:--:-- left" +#~ msgstr ", --.--:-- zbývá" + +#~ msgid "- Broken router and/or firewall" +#~ msgstr "- nefunkční router nebo brána firewall" + +#~ msgid "- File corrupted on mirror" +#~ msgstr "- poškozený soubor na zrcadle" + +#~ msgid "- Malware on your system" +#~ msgstr "- malware ve vašem systému" + +#~ msgid "" +#~ "A file with that name is already being edited. Do you want to reopen '%s'?" +#~ msgstr "" +#~ "Soubor s tímto názvem je již upravován. Chcete znovu otevřít soubor „%s“?" + +#~ msgid "Advanced options:" +#~ msgstr "Pokročilé možnosti:" + +#~ msgid "" +#~ "Alternatively, visit https://filezilla-project.org/ to download the most " +#~ "recent version." +#~ msgstr "" +#~ "Nebo navštivte https://filezilla-project.org/ pro získání nejnovější " +#~ "verze aplikace FileZilla." + +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Změny provedené ve správci míst nebudou uloženy, dokud soubor neopravíte." + +#~ msgid "Benchmark string coalescer" +#~ msgstr "Srovnávací test slučovače řetězců" + +#~ msgid "C&heck for nightly builds of FileZilla" +#~ msgstr "K&ontrolovat noční (vývojové) sestavení aplikace FileZilla" + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "Nelze porovnat složky, nejste připojeni k serveru." + +#~ msgid "Cannot load file, not a valid XML file." +#~ msgstr "Soubor neobsahuje platné XML, nelze ho načíst." + +#~ msgid "Certificate details" +#~ msgstr "Podrobnosti certifikátu" + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Vymazat položky ve &správci míst" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Vymazat &frontu přenosů" + +#~ msgid "Clear string coalescer" +#~ msgstr "Vyčistit slučovač řetězců" + +#~ msgid "Click on next to download the new version." +#~ msgstr "Pro stažení nové verze klikněte na Další." + +#~ msgid "Connecting to server" +#~ msgstr "Připojování k serveru" + +#~ msgid "" +#~ "Crashes FileZilla instantly. Only used to debug the exception handler" +#~ msgstr "" +#~ "Nechá aplikaci FileZilla spadnout. Používá se k ladění obsluhy výjimek" + +#~ msgid "" +#~ "Do you really want to check for beta versions?\n" +#~ "Unless you want to test new features, keep using stable versions." +#~ msgstr "" +#~ "Opravdu chcete zjišťovat i betaverze?\n" +#~ "Pokud nechcete testovat nové funkce, používejte stabilní verze." + +#~ msgid "Error, file name cannot be parsed." +#~ msgstr "Chyba, název souboru nelze analyzovat." + +#~ msgid "Error, local file exists but cannot be removed" +#~ msgstr "Chyba, místní soubor existuje, ale nelze ho odstranit" + +#~ msgid "Every month" +#~ msgstr "Každý měsíc" + +#~ msgid "Every two weeks" +#~ msgstr "Každé dva týdny" + +#~ msgid "Executable" +#~ msgstr "Spustitelný soubor" + +#~ msgid "Failed to check for newer version of FileZilla." +#~ msgstr "" +#~ "Nezdařilo se zkontrolovat existenci novější verze aplikace FileZilla." + +#~ msgid "Failed to parse trusted root cert." +#~ msgstr "Analýza důvěryhodného kořenového certifikátu se nezdařila." + +#~ msgid "" +#~ "Filename may not contain any of the following characters: / \\ : * ? \" < " +#~ "> |" +#~ msgstr "" +#~ "Název souboru nesmí obsahovat žádný z těchto znaků: / \\ : * ? \" < > |" + +#~ msgid "Fingerprint (MD5):" +#~ msgstr "Otisk (MD5):" + +#~ msgid "" +#~ "In case you prefer automatic updates, you can enable automatic update " +#~ "checks in the settings dialog." +#~ msgstr "" +#~ "Pokud máte raději automatické aktualizace, můžete povolit kontrolu nových " +#~ "verzí v dialogu nastavení." + +#~ msgid "Log of update check:" +#~ msgstr "Protokol kontroly aktualizací:" + +#~ msgid "Operating system problem detected" +#~ msgstr "Zjištěn problém operačního systému" + +#~ msgid "Package" +#~ msgstr "Balík" + +#~ msgid "" +#~ "Please check https://filezilla-project.org/ for the most recent version " +#~ "of FileZilla." +#~ msgstr "" +#~ "Podívejte se na https://filezilla-project.org/ pro získání nejnovější " +#~ "verze aplikace 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 "" +#~ "Zkontrolujte správce balíčků ve svém systému zda neobsahuje novější " +#~ "balíček nebo navštivte https://filezilla-project.org/ a stáhněte si " +#~ "zdrojový kód aplikace FileZilla." + +#~ msgid "" +#~ "Please retry downloading the update. Possible reasons if the problem " +#~ "persists (listed in order of decreasing probability):" +#~ msgstr "" +#~ "Zkuste znovu stáhnout aktualizaci. Možné důvody trvání problému (v " +#~ "sestupném pořadí dle pravděpodobnosti):" + +#~ msgid "" +#~ "Please visit https://filezilla-project.org/ for more information about " +#~ "FileZilla." +#~ msgstr "" +#~ "Navštivte https://filezilla-project.org/ pro získání více informací o " +#~ "aplikaci FileZilla." + +#~ msgid "" +#~ "Please visit https://filezilla-project.org/ to download the most recent " +#~ "version." +#~ msgstr "" +#~ "Navštivte https://filezilla-project.org/ pro získání nejnovější verze " +#~ "aplikace FileZilla." + +#~ 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" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "Dokument XML není správně strukturovaný: %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 "" +#~ "Soubor „%s“ není ve formátu podporovaném aplikací FileZilla.\n" +#~ "Soubor je také chráněn heslem. Aplikace FileZilla zatím nepodporuje " +#~ "soubory klíčů chráněné heslem.\n" +#~ "Chcete soubor převést do podporovaného a nechráněného formátu?" + +#~ 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 "" +#~ "Soubor „%s“ je chráněn heslem. Aplikace FileZilla zatím nepodporuje " +#~ "heslem chráněné soubory s klíči .\n" +#~ "Chcete soubor převést do nechráněné podoby?" + +#~ msgid "" +#~ "The most recent version has been downloaded. Click on Finish to close " +#~ "FileZilla and to start the installation." +#~ msgstr "" +#~ "Nejnovější verze byla stažena. Klikněte na Dokončit pro ukončení aplikace " +#~ "FileZilla a spuštění instalace." + +#~ msgid "" +#~ "The most recent version has been downloaded. Please install it the same " +#~ "way you installed this version." +#~ msgstr "" +#~ "Nejnovější verze byla stažena. Nainstalujte ji stejným způsobem jako jste " +#~ "nainstalovali tuto verzi." + +#~ msgid "" +#~ "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " +#~ "seconds." +#~ msgstr "" +#~ "Posun časové zóny: Server: %d sekund. Místní: %d sekund. Rozdíl: %d " +#~ "sekund." + +#~ msgid "" +#~ "Unknown error opening the file. Make sure the file can be accessed and is " +#~ "a well-formed XML document." +#~ msgstr "" +#~ "Neznámá chyba při otevírání souboru. Ujistěte se, že je soubor přístupný " +#~ "a správně strukturovaný XML dokument." + +#~ msgid "Update wizard" +#~ msgstr "Průvodce aktualizací" + +#~ msgid "Use plain FTP" +#~ msgstr "Použít prosté FTP" + +#~ msgid "Using proxy %s" +#~ msgstr "Používá se proxy %s" + +#~ msgid "Using this wizard you can check for available updates to FileZilla." +#~ msgstr "" +#~ "Pomocí tohoto průvodce můžete zkontrolovat dostupné aktualizace aplikace " +#~ "FileZilla." + +#~ 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 "" +#~ "Upozornění!\n" +#~ "\n" +#~ "Chyba v systému Windows způsobuje aplikaci FileZilla problémy\n" +#~ "\n" +#~ "Tato chyba se vyskytuje pokud máte\n" +#~ "- systém Windows Server 2003 nebo XP 64\n" +#~ "- povolenou bránu firewall systému Windows\n" +#~ "- povolenou službu brány aplikačního rozhraní\n" +#~ "Pro podrobné informace navštivte http://support.microsoft.com/" +#~ "kb/931130 .\n" +#~ "\n" +#~ "Dokud nevypnete bránu firewall systému Windows nebo službu brány " +#~ "aplikačního rozhraní\n" +#~ "aplikace FileZilla překročí časový limit při přenosu velkých souborů." + +#~ msgid "" +#~ "You are already using the most recent version of FileZilla. Please check " +#~ "again in future." +#~ msgstr "" +#~ "Používáte aktuální verzi aplikace FileZilla. Proveďte kontrolu zase v " +#~ "budoucnu." + #~ msgid "%s (%d.%d KB/s)" #~ msgstr "%s (%d,%d KiB/s)" @@ -8096,9 +8974,6 @@ #~ msgid "(At least 7 days)" #~ msgstr "(nejméně 7 dní)" -#~ msgid "Automatic update check" -#~ msgstr "Automatická kontrola aktualizací" - #~ msgid "Check for &beta versions and release candidates" #~ msgstr "Kontrolovat i &betaverze a kandidáty na vydání" @@ -8113,9 +8988,3 @@ #~ msgid "Privacy policy:" #~ msgstr "Ochrana soukromí:" - -#~ msgid "Only use plain FTP (insecure)" -#~ msgstr "Použít pouze obyčejné FTP (nezabezpečené)" - -#~ msgid "Use explicit FTP over TLS if available" -#~ msgstr "Použít explicitní FTP přes TLS pokud je k dispozici" diff -Nru filezilla-3.14.1/locales/da_DK.po filezilla-3.15.0.2/locales/da_DK.po --- filezilla-3.14.1/locales/da_DK.po 2015-06-02 15:13:56.000000000 +0000 +++ filezilla-3.15.0.2/locales/da_DK.po 2016-02-05 08:54:46.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-12 15:30+0200\n" -"PO-Revision-Date: 2015-06-02 09:28+0100\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" @@ -11,7 +11,7 @@ "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.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 @@ -44,8 +44,8 @@ msgstr[1] "%d mapper" #: ../../locales/../src/interface/RemoteListView.cpp:1386 -#: ../../locales/../src/interface/search.cpp:453 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../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" @@ -55,8 +55,8 @@ #: ../../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/search.cpp:483 +#: ../../locales/../src/interface/search.cpp:742 #, c-format msgid "%d file" msgid_plural "%d files" @@ -77,12 +77,12 @@ msgstr[0] "%d fil. Samlet størrelse: Mindst %s" msgstr[1] "%d filer. Samlet størrelse: Mindst %s" -#: ../../locales/../src/interface/QueueView.cpp:2796 +#: ../../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:101 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -93,6 +93,20 @@ 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" @@ -108,7 +122,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificat udløbet" @@ -133,14 +147,14 @@ 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 +#: ../../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:595 +#: ../../locales/../src/interface/FileZilla.cpp:617 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -154,7 +168,7 @@ "Download FileZilla igen. Hvis dette problem fortsætter, så rapporter det som " "en fejl." -#: ../../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,7 +186,7 @@ "miljøvariabel.\n" "- Angiv den fulde sti til %s i miljøvariablen FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s med %d bits" @@ -186,7 +200,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxy-adgangskode" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../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" @@ -194,14 +208,14 @@ 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: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:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 msgid "&Active" msgstr "Akti&v" @@ -215,15 +229,15 @@ msgstr "&Tilføj filer i køen" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." +msgid "&Add key file..." msgstr "&Tilføj nøglefil..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../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:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "&Juster serverens tidszoneforskydning:" @@ -231,7 +245,7 @@ msgid "&Always trust certificate in future sessions." msgstr "Stol &altid på certifikater i fremtidige sessioner." -#: ../../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 "Hav &altid tillid til denne vært, tilføj denne nøgle i cache" @@ -239,7 +253,7 @@ msgid "&Always use default editor" msgstr "Brug &altid standard-editor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "Brug &altid det valgte til uassocierede filer" @@ -252,17 +266,17 @@ msgstr "&Bed operativsystemet om den eksterne IP-adresse" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../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:461 +#: ../../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:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binær" @@ -275,14 +289,14 @@ msgid "&Bookmarks" msgstr "&Bogmærker" -#: ../../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/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:295 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 msgid "&Browse..." msgstr "&Gennemse..." @@ -291,9 +305,9 @@ msgstr "&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: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" @@ -311,7 +325,7 @@ msgid "&Close FileZilla" msgstr "Af&slut FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Konfigurér hastighedsgrænser..." @@ -319,7 +333,7 @@ msgid "&Configure..." msgstr "&Konfigurér..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "&Tilslut" @@ -327,19 +341,19 @@ msgid "&Copy current connection to Site Manager..." msgstr "&Kopier aktuel forbindelse til Websted Manager..." -#: ../../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: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:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../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:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "Åbn &ny fane" @@ -364,16 +378,16 @@ msgid "&Delay between failed login attempts:" msgstr "&Pause mellem mislykkede login-forsøg" -#: ../../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:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../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:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "Sl&et symlink" @@ -381,7 +395,17 @@ msgid "&Directory comparison" msgstr "&Mappesammenligning" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../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" @@ -401,7 +425,7 @@ msgid "&Display size in bytes" msgstr "&Vis størrelse i byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Husk ikke adgangskoder (anbefalet)" @@ -418,19 +442,19 @@ msgstr "Handling ved &dobbeltklik på filer:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "Do&wnload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "Do&wnload til:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "Do&wnload..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Downloadet:" @@ -440,14 +464,14 @@ msgid "&Edit" msgstr "&Rediger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../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:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" msgstr "Slå &til" @@ -455,12 +479,12 @@ msgid "&Enable compression" msgstr "Slå &komprimering til" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 +#: ../../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:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "Ind&kodning:" @@ -468,11 +492,11 @@ msgid "&Encryption:" msgstr "Kr&yptering:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "&Indtast brugerdefineret kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Etabler forbindelse i en ny fane" @@ -480,12 +504,12 @@ msgid "&Execute" msgstr "&Udfør" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../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:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." msgstr "&Eksportér..." @@ -497,7 +521,7 @@ msgid "&File" msgstr "&Fil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Fil-attributter..." @@ -505,33 +529,33 @@ msgid "&File permissions..." msgstr "&Filtilladelser..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Fil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "Filter&betingelser:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Filtersæt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtre:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../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:3121 +#: ../../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:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Følg symlink, slet indholdet af målmapper" @@ -543,7 +567,7 @@ msgid "&Getting help..." msgstr "&Få hjælp..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "Globalt &bogmærke" @@ -556,7 +580,7 @@ msgstr "&Hjælp" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Gem identiske filer" @@ -568,7 +592,7 @@ msgid "&Highest available port:" msgstr "&Højeste nr. port til rådighed:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 +#: ../../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:" @@ -594,10 +618,14 @@ msgid "&Install new version" msgstr "&Installér ny version" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../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:" @@ -606,7 +634,7 @@ 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:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "&Begræns antal samtidige forbindelser" @@ -614,8 +642,8 @@ msgid "&Local directory tree" msgstr "Lo&kalt mappetræ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "&Lokal mappe:" @@ -623,11 +651,11 @@ msgid "&Log to file" msgstr "&Log til fil" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Logontype:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Logontype:" @@ -643,7 +671,7 @@ msgid "&Manual transfer..." msgstr "&Manuel overførsel..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "Ma&ks. antal forbindelser:" @@ -663,7 +691,7 @@ msgid "&Name sorting mode:" msgstr "&Navnesorteringsmetode:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Navn:" @@ -671,7 +699,7 @@ msgid "&Network configuration wizard..." msgstr "&Konfigurationsassistent..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Ny" @@ -679,16 +707,16 @@ msgid "&New Site" msgstr "&Nyt websted" -#: ../../locales/../src/interface/Mainfrm.cpp:1723 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Ny version findes!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Næste >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&Nej" @@ -706,8 +734,8 @@ msgstr "&Numerisk værdi:" #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&OK" @@ -716,7 +744,7 @@ msgstr "&ÅBEN" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" msgstr "&Åbn" @@ -724,7 +752,7 @@ msgid "&Overwrite" msgstr "&Overskriv" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Passiv" @@ -736,7 +764,7 @@ msgid "&Play sound" msgstr "Afspil &lyd" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 +#: ../../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:" @@ -746,7 +774,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Bevar tidsstempel på overførte filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "&Sæt i kø" @@ -758,7 +786,7 @@ msgid "&Quickconnect bar" msgstr "&Lyntilslutningsbjælke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 msgid "&Quickconnect history" msgstr "&Lyntilslut-historik" @@ -770,12 +798,12 @@ msgid "&Reconnect" msgstr "&Tilslut igen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 +#: ../../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:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" msgstr "&Genopfrisk" @@ -783,16 +811,16 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Husk adgangskode indtil FileZilla lukkes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Husk adgangskoder" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../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:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "Sti på f&jernsted:" @@ -808,21 +836,21 @@ msgid "&Remove selected" msgstr "Fjern &valgte" -#: ../../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:2830 #: ../../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/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:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "Om&døb..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "&Genåbn lokal fil" @@ -834,7 +862,7 @@ msgid "&Report a bug..." msgstr "&Rapportér en fejl..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" msgstr "&Nulstil og sæt alle i kø igen" @@ -866,11 +894,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "Gem &som..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Søg" @@ -886,16 +914,16 @@ msgid "&Select language:" msgstr "&Vælg sprog" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../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:2298 +#: ../../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:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "&Indstillinger" @@ -907,7 +935,7 @@ msgid "&Show debug menu" msgstr "&Vis debug-menu" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "&Vis detaljer i log" @@ -919,7 +947,7 @@ msgid "&Show timestamps in message log" msgstr "Vis &tidsstempler i beskedlog" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 msgid "&Site Manager entries" msgstr "&Websted Manager-liste" @@ -927,7 +955,7 @@ msgid "&Site Manager..." msgstr "&Websted Manager..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Sted-specifikt bogmærke" @@ -939,7 +967,7 @@ msgid "&Speed limits" msgstr "&Hastighedsgrænser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Start overførsel &straks" @@ -947,11 +975,11 @@ msgid "&Swap local and remote panes" msgstr "&Ombyt lokalt sted og fjernsted" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "&TLS-koder" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Test" @@ -963,11 +991,11 @@ msgid "&Transfer" msgstr "&Overfør" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "Over&førselstilstand:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "&Overførselskø" @@ -976,29 +1004,29 @@ msgid "&Treat dotfiles as ASCII files" msgstr "Behandl &dot-filer som ASCII-filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "&Fortryd redigering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../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:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../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:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Anvend brugerdef. program" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "Anvend &synkroniseret bladring" @@ -1019,8 +1047,8 @@ msgstr "Brug &tusindadskiller" #: ../../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:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Bruger:" @@ -1028,7 +1056,7 @@ msgid "&Username:" msgstr "&Brugernavn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1717 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Version %s" @@ -1038,7 +1066,7 @@ msgstr "&Vis" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Vis/Rediger" @@ -1054,30 +1082,30 @@ msgid "&Write" msgstr "S&kriv" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../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: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' findes ikke eller kan ikke tilgå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: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:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../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:440 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1085,7 +1113,7 @@ "Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Bruger 'Bed om " "adgangskode' i stedet." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1093,7 +1121,7 @@ "Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Din indtastning er " "ændret til 'Bed om adgangskode'." -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../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 " @@ -1136,8 +1164,8 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 for at slå fra)" -#: ../../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 sat til %d.%d)" @@ -1150,8 +1178,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(eksempel: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 +#: ../../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 @@ -1198,7 +1226,7 @@ msgid "3 - Verbose" msgstr "3 - Mange ord" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" msgstr "32-bit system" @@ -1206,11 +1234,11 @@ msgid "4 - Debug" msgstr "4 - Debug" -#: ../../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 "< &Tilbage" @@ -1218,7 +1246,7 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" @@ -1230,8 +1258,8 @@ msgstr "Du skal angive en standard-editor." #: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:783 +#: ../../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." @@ -1245,21 +1273,21 @@ "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:1659 +#: ../../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:1676 +#: ../../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:1680 +#: ../../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: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 " @@ -1277,7 +1305,7 @@ msgid "A new version of FileZilla is available:" msgstr "Der findes en ny version af FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:658 +#: ../../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." @@ -1294,7 +1322,7 @@ "En ordentlig server kræver ikke dette. Kontakt serverens administrator, hvis " "du må slå dette til." -#: ../../locales/../src/interface/state.cpp:263 +#: ../../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?" @@ -1305,7 +1333,7 @@ "mappe?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1316,7 +1344,7 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" -msgstr "T&illad genoptagelse af ASCII-filer" +msgstr "&Tillad genoptagelse af ASCII-filer" #: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" @@ -1330,11 +1358,11 @@ msgid "A&pply to all files and directories" msgstr "S&kal gælde alle filer og mapper" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../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:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1346,15 +1374,15 @@ msgid "Above the file lists" msgstr "Oven over fil-listerne" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../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: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/sitemanager_dialog.cpp:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../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" @@ -1362,11 +1390,11 @@ msgid "Action after queue &completion" msgstr "&Handling efter afvikling af kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../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:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Handling, der skal udføres:" @@ -1378,7 +1406,7 @@ msgid "Active mode" msgstr "Aktiv tilstand" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1386,7 +1414,7 @@ "FTP-test i aktiv tilstand fejlede. FileZilla kender ikke den korrekte " "eksterne IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1394,7 +1422,7 @@ "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:595 +#: ../../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 " @@ -1408,12 +1436,12 @@ msgid "Active mode IP" msgstr "Aktiv tilstand IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../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:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../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" @@ -1427,11 +1455,11 @@ msgid "Add to queue" msgstr "Tilføj i kø" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Adressetype ikke understøttet" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Avanceret" @@ -1449,15 +1477,15 @@ "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:3470 +#: ../../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:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Algoritme:" -#: ../../locales/../src/interface/QueueView.cpp:2978 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Overførsel af alle filer lykkedes" @@ -1465,7 +1493,7 @@ 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:2974 +#: ../../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." @@ -1480,11 +1508,11 @@ 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:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Allerede tilsluttet" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativt navn:" @@ -1512,7 +1540,7 @@ "website:" msgstr "Du kan også hente den seneste version fra FileZillas websted:" -#: ../../locales/../src/interface/QueueView.cpp:1924 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1521,7 +1549,7 @@ "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:1829 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1530,7 +1558,7 @@ "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:1926 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1538,38 +1566,30 @@ "Et objekt med samme navn som det trukne objekt findes allerede på " "destinationsstedet." -#: ../../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: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:967 +#: ../../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:792 +#: ../../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/sitemanager_dialog.cpp:740 -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." - #: ../../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:971 +#: ../../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." @@ -1577,7 +1597,7 @@ msgid "App&ly to directories only" msgstr "Skal kun gælde &mapper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Anvend" @@ -1593,7 +1613,7 @@ msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Overløb i parameter-buffer" @@ -1601,17 +1621,17 @@ msgid "As tab in the transfer queue pane" msgstr "Som faneblad i overførselskø-ruden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../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:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../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" @@ -1623,7 +1643,7 @@ 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:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Stil spørgsmål i FileZillas fora" @@ -1631,7 +1651,7 @@ msgid "Associated program not found:" msgstr "Det associerede program kunne ikke findes:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:704 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" msgstr "Mindst en filterbetingelse er ufuldstændig" @@ -1643,7 +1663,7 @@ msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Validering fejlede." @@ -1651,7 +1671,7 @@ msgid "Author:" msgstr "Forfatter:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Auto" @@ -1663,20 +1683,20 @@ msgid "Available sizes" msgstr "Mulige størrelser" -#: ../../locales/../src/engine/sizeformatting_base.cpp:160 -#: ../../locales/../src/engine/sizeformatting_base.cpp:219 +#: ../../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:309 msgid "B&ypass proxy" msgstr "F&orbigå proxy" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Forkert filbeskrivelse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Grundlæggende anvendelse" @@ -1684,16 +1704,16 @@ msgid "Behaviour" msgstr "Adfærd" -#: ../../locales/../src/interface/edithandler.cpp:1127 -#: ../../locales/../src/interface/edithandler.cpp:1155 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "Under redigering" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../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:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Binær" @@ -1701,20 +1721,24 @@ 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/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:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Bogmærke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../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:" @@ -1723,7 +1747,7 @@ msgid "Build information" msgstr "Build-information" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Forretningskategori:" @@ -1741,12 +1765,12 @@ msgid "C&ancel current operation" msgstr "A&nnuller aktuel handling" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../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:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "Kopiér &URL til Udklipsholder" @@ -1758,22 +1782,26 @@ msgid "C&ustom filetype associations:" msgstr "Br&ugerdefinerede filtypeassociationer:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1591 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1201 +#: ../../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:646 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Kan ikke læse fra fil" -#: ../../locales/../src/engine/transfersocket.cpp:626 -#: ../../locales/../src/engine/transfersocket.cpp:692 +#: ../../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:628 -#: ../../locales/../src/engine/transfersocket.cpp:694 +#: ../../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" @@ -1781,23 +1809,24 @@ #: ../../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: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" @@ -1809,20 +1838,20 @@ msgid "Cancels the current operation" msgstr "Annuller aktuel 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 ikke tilgå '%s', intet medie eller drevet er ikke klar." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../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:1103 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Kan ikke tildele den angivne adresse" -#: ../../locales/../src/interface/context_control.cpp:342 +#: ../../locales/../src/interface/context_control.cpp:352 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1830,7 +1859,7 @@ "Kan ikke lukke fane når optaget.\n" "Annullér aktuel handling, og luk fane?" -#: ../../locales/../src/interface/listingcomparison.cpp:73 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1838,30 +1867,26 @@ "Kan ikke sammenligne mapper - forskellige filtre for lokale og fjerne mapper " "er slået til" -#: ../../locales/../src/interface/RemoteListView.cpp:2282 -msgid "Cannot compare directories, not connected to a server." -msgstr "Kan ikke sammenligne mapper, ikke forbundet til en server." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Kan ikke oprette nyt filter" -#: ../../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: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:1581 +#: ../../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:1590 +#: ../../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:311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1874,53 +1899,53 @@ 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:388 -msgid "Cannot load keyfile" +#: ../../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:1019 +#: ../../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:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Har glemt adgangskode" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../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:1585 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Kan ikke omdøbe fil" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../../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:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../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:305 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Kan ikke vælge filter" -#: ../../locales/../src/interface/edithandler.cpp:1503 -#: ../../locales/../src/interface/edithandler.cpp:1507 -#: ../../locales/../src/interface/edithandler.cpp:1542 +#: ../../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:1086 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Kan ikke vise dialog" -#: ../../locales/../src/interface/edithandler.cpp:1676 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Kan ikke vise/redigere den valgte fil" @@ -1940,7 +1965,7 @@ msgid "Case sensitive (default)" msgstr "Skeln mellem store og små bogstaver (standard)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 msgid "Categories to clear" msgstr "Kategorier der skal fjernes" @@ -1965,7 +1990,7 @@ msgstr "Rediger fil-attributter" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Rediger filtilladelser." @@ -1973,11 +1998,11 @@ msgid "Changing logfile settings requires restart of FileZilla." msgstr "Ændringer i logfil-indstillinger kræver genstart af FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Problem med tegnindkodning" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Tegnsæt" @@ -2001,7 +2026,7 @@ msgid "Check for updates failed" msgstr "Søgning efter opdateringer fejlede" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:771 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2009,7 +2034,7 @@ "Kontroller dine login-oplysninger. Den angivne adgangskode begynder eller " "slutter med et mellemrum." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:767 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2017,7 +2042,7 @@ "Kontroller dine login-oplysninger. Det angivne brugernavn begynder eller " "slutter med et mellemrum." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Kontrollerer korrekt ekstern IP-adresse" @@ -2025,27 +2050,31 @@ msgid "Checking for updates..." msgstr "Søger efter opdateringer..." -#: ../../locales/../src/interface/updater.cpp:779 +#: ../../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:775 +#: ../../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:1447 +#: ../../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:131 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:372 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2138 +#: ../../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:819 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Data-chunk ikke afsluttet korrekt" @@ -2054,7 +2083,7 @@ msgstr "Kode:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "&Luk fane" @@ -2062,7 +2091,7 @@ msgid "Classic" msgstr "Klassisk" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" msgstr "Ryd &layout-cache" @@ -2070,7 +2099,7 @@ msgid "Clear history" msgstr "Tøm historik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 +#: ../../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 @@ -2083,25 +2112,25 @@ msgid "Clear quickconnect bar" msgstr "Fjern Lyntilslut-bjælken" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../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:2037 +#: ../../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:2027 +#: ../../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:609 +#: ../../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:1160 -#: ../../locales/../src/interface/Mainfrm.cpp:1181 +#: ../../locales/../src/interface/Mainfrm.cpp:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Afslut FileZilla" @@ -2113,15 +2142,15 @@ msgid "Closes current tab" msgstr "Lukker den aktuelle fane" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Kommenta&rer:" -#: ../../locales/../src/interface/listctrlex.cpp:745 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "Column properties" msgstr "Kolonneegenskaber" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Kolonneopsætning" @@ -2129,13 +2158,13 @@ msgid "Command and its arguments should be properly quoted." msgstr "Kommandoen og dens parametre skal sættes korrekt i anførselstegn." -#: ../../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: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:485 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Kommando ikke understøttet" @@ -2143,32 +2172,32 @@ msgid "Command not supported by this protocol" msgstr "Kommandoen understøttes ikke af denne protokol" -#: ../../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 "Kommando:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Kommando navn:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../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:526 +#: ../../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:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Sammenlign &filstørrelse" @@ -2204,8 +2233,8 @@ msgid "Concurrent transfers" msgstr "Samtidige overførsler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../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" @@ -2221,24 +2250,24 @@ msgid "Configure port range" msgstr "Konfigurer portinterval" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../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:743 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Bekræft sletning" -#: ../../locales/../src/engine/local_filesys.cpp:129 -#: ../../locales/../src/interface/edithandler.cpp:1618 -#: ../../locales/../src/interface/LocalListView.cpp:1663 +#: ../../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:1057 -#: ../../locales/../src/interface/search.cpp:699 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 +#: ../../locales/../src/interface/search.cpp:708 msgid "Confirmation needed" msgstr "Foretag et valg" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Tillykke - din konfiguration ser ud til at fungere." @@ -2246,6 +2275,11 @@ 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" @@ -2258,28 +2292,25 @@ msgid "Connect to specified Site Manager site" msgstr "Forbind til angivne Websted Manager-sted" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:896 -msgid "Connected" -msgstr "Tilsluttet" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Tilslutter" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../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:1045 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format -msgid "Connecting to %s through proxy" -msgstr "Tilslutter til %s gennem proxy" +msgid "Connecting to %s through %s proxy" +msgstr "Tilslutter til %s gennem %s proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:953 -#: ../../locales/../src/engine/proxy.cpp:226 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../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..." @@ -2288,176 +2319,185 @@ msgid "Connection" msgstr "Forbindelse" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Forbindelse lukket ned" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Forbindelsesforsøg mislykkedes" -#: ../../locales/../src/engine/ControlSocket.cpp:918 -#: ../../locales/../src/engine/proxy.cpp:200 +#: ../../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:922 +#: ../../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:181 -#: ../../locales/../src/engine/engineprivate.cpp:674 +#: ../../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:1057 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Forsøg på forbindelse afsluttet ved timeout" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Forbindelse lukket" -#: ../../locales/../src/engine/ControlSocket.cpp:1012 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:218 +#: ../../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:355 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../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:319 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Forbindelse etableret, sender HTTP-anmodning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:383 +#: ../../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:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Forbindelse mistet" -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Forbindelse ikke tilladt af regelsæt" -#: ../../locales/../src/engine/proxy.cpp:479 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Forbindelse nægtet" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Forbindelse nægtet af server" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Forbindelse nulstillet af netværk" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Forbindelse nulstillet af peer" -#: ../../locales/../src/engine/ControlSocket.cpp:555 +#: ../../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:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Forbindelse mistet ved timeout." -#: ../../locales/../src/interface/search.cpp:358 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Forbindelse til server tabt." -#: ../../locales/../src/engine/proxy.cpp:209 +#: ../../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:576 +#: ../../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:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Forbindelse til testserveren fejlede." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:276 -msgid "Convert keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" msgstr "Konvertér nøglefil" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:642 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../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:622 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../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:507 +#: ../../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:178 +#: ../../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:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../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:798 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Kunne ikke færdiggøre handling" -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Kunne ikke forbinde til server" -#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../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:777 +#: ../../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/settings/optionspage_connection_sftp.cpp:315 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../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:2542 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../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:175 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Kunne ikke kopiere data" -#: ../../locales/../src/interface/updater.cpp:522 +#: ../../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/interface/RemoteListView.cpp:2196 -#: ../../locales/../src/interface/RemoteTreeView.cpp:855 +#: ../../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 " @@ -2467,11 +2507,11 @@ "Enten er shell-udvidelsen ikke installeret korrekt, eller slap du ikke " "filerne i et Stifinder-vindue." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4126 +#: ../../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: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 " @@ -2482,11 +2522,11 @@ "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:667 +#: ../../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:937 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2494,7 +2534,7 @@ "Kunne ikke få DN (Distinguished Name) på certifikat-udstederen - " "gnutls_x509_get_issuer_dn fejlede" -#: ../../locales/../src/engine/tlssocket.cpp:914 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2502,26 +2542,31 @@ "Kunne ikke få DN (Distinguished Name) på certifikat-emnet - " "gnutls_x509_get_dn fejlede" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Kunne ikke hente den fulde fjernsti." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../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:1606 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../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:860 +#: ../../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/engine/tlssocket.cpp:855 +#: ../../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" @@ -2529,8 +2574,8 @@ "Kunne ikke initialisere struktur for peer-certifikater - " "gnutls_x509_crt_init fejlede" -#: ../../locales/../src/interface/import.cpp:98 -#: ../../locales/../src/interface/import.cpp:284 +#: ../../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 " @@ -2541,15 +2586,15 @@ "til den.\n" "Eventuelle ændringer i Websted Manager vil ikke blive bevaret." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:227 -msgid "Could not load keyfile" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" msgstr "Kunne ikke indlæse nøglefil" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:301 +#: ../../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:977 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2561,7 +2606,7 @@ "Vil du slå synkroniseret bladring fra, og fortsætte med at ændre mappe på " "fjernstedet?" -#: ../../locales/../src/interface/state.cpp:371 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2571,7 +2616,7 @@ "Kunne ikke finde en tilsvarende lokal mappe for fjernmappen '%s'.\n" "Synkroniseret bladring er slået fra." -#: ../../locales/../src/interface/state.cpp:272 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2581,20 +2626,20 @@ "Kunne ikke finde tilsvarende fjernmappe for den lokale mappe '%s'.\n" "Synkroniseret bladring er slået fra." -#: ../../locales/../src/interface/aboutdialog.cpp:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2542 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1405 +#: ../../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:105 -#: ../../locales/../src/engine/logging.cpp:172 -#: ../../locales/../src/engine/logging.cpp:204 +#: ../../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:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Kunne ikke fortolke fjernstien." @@ -2602,43 +2647,51 @@ msgid "Could not parse server address:" msgstr "Kunne ikke fortolke serveradressen:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:209 +#: ../../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:488 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Kunne ikke læse fra server." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2621 +#: ../../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:2533 +#: ../../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/settings/optionspage_connection_sftp.cpp:140 +#: ../../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:2649 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Kunne ikke danne IO-tråd" -#: ../../locales/../src/engine/ControlSocket.cpp:1059 +#: ../../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:388 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Kunne ikke starte overførsel" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2647,17 +2700,17 @@ "Kunne ikke skrive \"%s\" - eventuelle ændringer i Websted Manager kunne ikke " "bevares: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:836 +#: ../../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:324 +#: ../../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:1858 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2666,40 +2719,40 @@ "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.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2119 +#: ../../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:125 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "Kunne ikke skrive \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" +msgid "Could not write key file: %s" msgstr "Kunne ikke skrive nøglefil: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../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:212 -#: ../../locales/../src/engine/logging.cpp:277 +#: ../../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:878 -#: ../../locales/../src/engine/ControlSocket.cpp:981 +#: ../../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:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Land:" @@ -2707,17 +2760,25 @@ 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:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../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:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../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" @@ -2727,50 +2788,50 @@ #: ../../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: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:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/LocalListView.cpp:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 #: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1241 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Create directory" msgstr "Opret mappe" -#: ../../locales/../src/interface/RemoteListView.cpp:2629 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Opret tom fil" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Opretter mappe" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3196 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1934 +#: ../../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:176 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kritisk fejl" -#: ../../locales/../src/engine/ControlSocket.cpp:167 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kritisk fejl:" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kritisk fejl i filoverførsel" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../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:362 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2791,21 +2852,25 @@ 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:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Brugerdefineret filtersæt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../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:2483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "D&atatype" @@ -2813,17 +2878,21 @@ 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:392 +#: ../../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:498 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:597 +#: ../../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:1084 +#: ../../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" @@ -2833,10 +2902,10 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" -msgstr "Handling ved &dobbeltklik på mapper:" +msgstr "Handling ved d&obbeltklik på mapper:" -#: ../../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:2842 msgid "D&uplicate" msgstr "Lav &kopi" @@ -2844,16 +2913,16 @@ msgid "DOS-like with virtual paths" msgstr "DOS-agtig med virtuelle stier" -#: ../../locales/../src/interface/edithandler.cpp:1658 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Farlig 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:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Data-socket lukket for tidligt." @@ -2881,7 +2950,7 @@ msgid "Debugging settings" msgstr "Indstillinger for debug" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Standard-&lokalmappe:" @@ -2893,17 +2962,17 @@ msgid "Default editor not properly quoted." msgstr "Standard-editor ikke korrekt sat i anførselstegn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../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:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "Standard-&fjernmappe:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../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." @@ -2935,7 +3004,7 @@ "Pause mellem mislykkedes forbindelses-forsøg skal være mellem 1 og 999 " "sekunder." -#: ../../locales/../src/engine/engineprivate.cpp:518 +#: ../../locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2950,12 +3019,12 @@ "Udsætter forbindelse i %d sekunder på grund af tidligere mislykkedes " "forbindelses-forsøg..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../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:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" msgstr "Slet valgte mappe" @@ -2964,46 +3033,43 @@ msgid "Delete selected files and directories" msgstr "Slet valgte filer og mapper" -#: ../../locales/../src/engine/engineprivate.cpp:367 +#: ../../locales/../src/engine/engineprivate.cpp:365 #, c-format msgid "Deleting \"%s\"" msgstr "Sletter \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:370 +#: ../../locales/../src/engine/engineprivate.cpp:368 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "Sletter %u filer fra \"%s\"" -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting directories" -msgstr "Sletter mapper" - -#: ../../locales/../src/interface/search.cpp:728 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Sletning af flere urelaterede mapper er endnu ikke understøttet" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Sletter symbolsk link" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../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:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Detaljer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Detaljer for ny nøgle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../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:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Retning" @@ -3011,17 +3077,17 @@ msgid "Directory" msgstr "Mappe" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../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:464 -#: ../../locales/../src/interface/Mainfrm.cpp:2232 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Mappesammenligning" -#: ../../locales/../src/interface/listingcomparison.cpp:73 -#: ../../locales/../src/interface/listingcomparison.cpp:80 -#: ../../locales/../src/interface/listingcomparison.cpp:85 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "Directory comparison failed" msgstr "Mappesammenligning fejlede" @@ -3029,37 +3095,37 @@ 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:187 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Mappevisning afbrudt af bruger" -#: ../../locales/../src/interface/RemoteListView.cpp:2024 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Visning af mappeindhold fejlede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Mappefiltre" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../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:192 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Mappeindhold vist" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "S&lå alle fra" -#: ../../locales/../src/interface/state.cpp:985 +#: ../../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:660 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3071,23 +3137,23 @@ msgid "Disconnect from server" msgstr "Afbryd forbindelse til server" -#: ../../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: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:1014 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../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:380 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Afbryder forbindelsen til forrige server" @@ -3108,14 +3174,14 @@ msgid "Do ¬hing" msgstr "Gør &intet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../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:1163 -#: ../../locales/../src/interface/Mainfrm.cpp:1185 +#: ../../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?" @@ -3129,7 +3195,7 @@ 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:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Vil du virkelig slette det valgte objekt?" @@ -3137,16 +3203,16 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Vil du virkelig slette overførselskøen" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../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:1849 +#: ../../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:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentation" @@ -3163,11 +3229,11 @@ msgid "Double-click action" msgstr "Handling ved dobbeltklik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "&Download-grænse" @@ -3181,13 +3247,13 @@ msgid "Download limit: none" msgstr "Download-grænse: ingen" -#: ../../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: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:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Download valgte mappe" @@ -3195,7 +3261,7 @@ msgid "Download selected files and directories" msgstr "Download valgte filer og mapper" -#: ../../locales/../src/interface/Mainfrm.cpp:991 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3204,43 +3270,35 @@ "Download-hastighed: %s/s\n" "Upload-hastighed: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "Downloader" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Henter %s" -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Hentning af flere urelaterede mapper er endnu ikke understøttet" - -#: ../../locales/../src/interface/search.cpp:590 -msgid "Downloading search results" -msgstr "Henter søgeresultater" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Henter opdatering..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../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:87 +#: ../../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:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../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:93 +#: ../../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." @@ -3248,7 +3306,7 @@ msgid "Dupl&icate" msgstr "Lav &kopi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "Sl&å alle til" @@ -3265,15 +3323,21 @@ msgid "E&xit" msgstr "&Afslut" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../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:688 +#: ../../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:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "Rediger filtre" @@ -3283,16 +3347,16 @@ msgstr "" "Rediger filen med den valgte editor, og overfør ændringerne til serveren." -#: ../../locales/../src/interface/search.cpp:675 +#: ../../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:1581 -#: ../../locales/../src/interface/LocalListView.cpp:1590 +#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Editing failed" msgstr "Kunne ikke redigere" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Redigerer søgeresultater" @@ -3300,7 +3364,7 @@ msgid "Email:" msgstr "E-post:" -#: ../../locales/../src/interface/QueueView.cpp:2143 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Tom kommando" @@ -3308,7 +3372,7 @@ msgid "Empty command." msgstr "Tom kommando." -#: ../../locales/../src/interface/RemoteListView.cpp:2026 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Tom mappeliste" @@ -3334,7 +3398,7 @@ msgid "Empty quoted string." msgstr "Tom streng i anførselstegn." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "Slå alle &til" @@ -3346,15 +3410,15 @@ msgid "Encrypted" msgstr "Krypteret" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Kryptering" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Krypteringsdetaljer" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Afslut sammenligning og skift sorteringsrækkefølge?" @@ -3362,15 +3426,15 @@ msgid "Enter &custom command..." msgstr "Indtast &brugerdefineret kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../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:2132 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Indtast kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Indtast brugerdefineret kommando" @@ -3384,11 +3448,11 @@ msgid "Enter filter name" msgstr "Angiv et filternavn" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Angiv navn på filtersæt" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Angiv nyt navn på filtersæt" @@ -3428,14 +3492,14 @@ "- ftps:// til FTP via TLS (implicit)\n" "- ftpes:// til FTP via TLS (eksplicit)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../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 "" "Angiv adgangskoden til filen '%s'.\n" -"Bemærk, at den konverterede fil ikke vil være beskyttet med adgangskode." +"Den konverterede fil ikke være beskyttet med samme adgangskode." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3445,7 +3509,7 @@ "Angiv den port, serveren lytter på.\n" "Standarden for FTP er 21, standarden for SFTP er 22." -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Indtast brugernavn og adgangskode" @@ -3454,63 +3518,63 @@ msgstr "Fejl-eksport indstillinger" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Fejl-importering" -#: ../../locales/../src/interface/QueueView.cpp:1925 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Fejl ved indlæsning af kø" -#: ../../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/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: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/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: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/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:1830 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Fejl ved gem af kø" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:98 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../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:325 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:837 -#: ../../locales/../src/interface/QueueView.cpp:1859 -#: ../../locales/../src/interface/sitemanager.cpp:657 +#: ../../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.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/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: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 "Fejl:" @@ -3536,19 +3600,19 @@ msgid "Explorer" msgstr "Stifinder" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" msgstr "Eksportér &kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "Eksportér &indstillinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Eksportér indstillinger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "F&ilternavn:" @@ -3556,7 +3620,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - File Transfer Protocol" @@ -3569,7 +3633,7 @@ msgstr "FTP - Usikker File Transfer Protocol" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-systemet ikke initialiseret - kan ikke oprette forbindelse" @@ -3602,135 +3666,139 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP via implicit TLS" -#: ../../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: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: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 "Kunne ikke skifte sprog" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1926 +#: ../../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:466 +#: ../../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:802 +#: ../../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:4105 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4109 +#: ../../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:626 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Kunne ikke åbne 'Dokumenter'" -#: ../../locales/../src/interface/LocalTreeView.cpp:614 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Kunne ikke skifte til Skrivebord" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../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:967 +#: ../../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:79 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Kunne ikke initialisere FTP-systemet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:363 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:742 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../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/settings/optionspage_connection_sftp.cpp:300 +#: ../../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:2523 +#: ../../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:2589 +#: ../../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:2555 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../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:342 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Kunne ikke fortolke den returnerede sti." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Kunne ikke modtage data" -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Kunne ikke hente mappeindholdsliste" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../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:3816 +#: ../../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:3837 +#: ../../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:706 +#: ../../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:631 +#: ../../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:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Kunne ikke sende kommando." -#: ../../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 "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget" -#: ../../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)." @@ -3738,24 +3806,24 @@ "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget (%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 "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget." -#: ../../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 "Kunne ikke sætte sproget til %s, anvender standardsystemsproget" -#: ../../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 "" "Kunne ikke sætte sproget til %s - anvender standardsystemsproget (%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 "Kunne ikke sætte sproget til %s - anvender standardsystemsproget." @@ -3764,16 +3832,16 @@ msgid "Failed to validate settings" msgstr "Kunne ikke validere indstillinger" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Kunne ikke verificere peer-certifikat" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../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:483 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "Kunne ikke skrive xml-fil" @@ -3785,11 +3853,11 @@ msgid "Fall back to active mode" msgstr "Fald tilbage til aktiv tilstand" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "F&il:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Fil&er" @@ -3801,11 +3869,11 @@ msgid "File Types" msgstr "Filtyper" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Filbeskrivelsen er ikke en socket" -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "Filen indeholder ingen data der kan importeres." @@ -3813,7 +3881,7 @@ msgid "File editing" msgstr "Filredigering" -#: ../../locales/../src/interface/RemoteListView.cpp:1599 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Filen findes" @@ -3821,7 +3889,7 @@ msgid "File exists action" msgstr "Fil findes-handling" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "Filen er ændret" @@ -3829,9 +3897,9 @@ msgid "File lists" msgstr "Fil-lister" -#: ../../locales/../src/interface/edithandler.cpp:1582 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../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" @@ -3840,52 +3908,52 @@ msgid "File search" msgstr "Filsøgning" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Filoverførsel afbrudt af bruger" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../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:133 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Filoverførsel slog fejl" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../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:128 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Filoverførsel sprunget over" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Filoverførsel lykkedes" -#: ../../locales/../src/engine/ControlSocket.cpp:111 +#: ../../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:1162 +#: ../../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:2502 +#: ../../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:2507 +#: ../../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:407 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "Fejl i FileZilla" @@ -3897,11 +3965,11 @@ "FileZilla kan nu teste din konfiguration nu for at sikre, at alt er " "konfigureret korrekt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../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:1492 +#: ../../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." @@ -3913,12 +3981,12 @@ msgid "Filelist status &bars" msgstr "Filliste-&statuslinier" -#: ../../locales/../src/interface/edithandler.cpp:1097 +#: ../../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:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../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" @@ -3926,21 +3994,21 @@ msgid "Filename &filters..." msgstr "&Filnavnefiltre..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3000 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2176 +#: ../../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:1585 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Ugyldigt filnavn" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Filnavn ikke ændret" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Filnavn:" @@ -3955,14 +4023,14 @@ "|" msgstr "Filnavne må ikke indeholde nogen af følgende tegn: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../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:275 -#: ../../locales/../src/interface/RemoteListView.cpp:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/LocalListView.cpp:277 +#: ../../locales/../src/interface/RemoteListView.cpp:374 +#: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" msgstr "Filstørrelse" @@ -3970,9 +4038,9 @@ msgid "Filesize format" msgstr "Filstørrelsesformat" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:278 +#: ../../locales/../src/interface/RemoteListView.cpp:375 +#: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" msgstr "Filtype" @@ -3981,7 +4049,7 @@ msgid "Filetype associations" msgstr "Filetypeassociationer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "Filtret vedrører:" @@ -3992,24 +4060,24 @@ #: ../../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 "Filternavn findes allerede" -#: ../../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 "Bortfiltrér emner, der matcher alt det følgende" -#: ../../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 "Bortfiltrér emner, der matcher noget af det følgende" -#: ../../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 "Bortfiltrér emner, der matcher intet af det følgende" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "Filtersæt findes allerede" @@ -4017,19 +4085,19 @@ msgid "Filter the directory listings" msgstr "Filtrer mappelisterne" -#: ../../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 "Validering af filter fejlede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Find &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" -msgstr "Find &mapper" +msgstr "Find m&apper" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 msgid "Fingerprint (SHA-1):" @@ -4039,12 +4107,12 @@ msgid "Fingerprint (SHA-256):" msgstr "Fingeraftryk (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 "Fingeraftryk:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Assistent til firewall- og router-konfiguration" @@ -4062,7 +4130,7 @@ "For størst mulig driftsikkerhed skal du angive et interval på mindst 10 " "porte." -#: ../../locales/../src/interface/Options.cpp:243 +#: ../../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." @@ -4070,7 +4138,7 @@ "Standardindstillingerne vil blive brugt i denne session. Eventuelle " "ændringer i indstillingerne vil ikke blive gemt." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "Gennemtving &UTF-8" @@ -4078,7 +4146,7 @@ msgid "Force showing &hidden files" msgstr "&Se skjulte filer" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Se skjulte filer" @@ -4093,12 +4161,12 @@ "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:710 +#: ../../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:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Yderligere dokumentation" @@ -4106,7 +4174,7 @@ msgid "General" msgstr "Generelt" -#: ../../locales/../src/engine/proxy.cpp:467 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Generel SOCKS-serverfejl" @@ -4119,36 +4187,36 @@ 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:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Få hjælp" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../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:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Globale bogmærker" -#: ../../locales/../src/engine/tlssocket.cpp:185 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-fejl %d" -#: ../../locales/../src/engine/tlssocket.cpp:187 +#: ../../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:181 +#: ../../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:179 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-fejl %d: %s" @@ -4169,7 +4237,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP via TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Hash-værdi:" @@ -4178,21 +4246,21 @@ msgstr "Skjult" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 +#: ../../locales/../src/interface/queue.cpp:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Høj" -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../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: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øjeste portnummer til rådighed skal være et tal mellem 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 "" @@ -4202,15 +4270,15 @@ msgid "Homepage:" msgstr "Hjemmeside:" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Vært er nede" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../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:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "Værtsnøgle stemmer ikke" @@ -4218,26 +4286,26 @@ 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:476 +#: ../../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: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 "Vært:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../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 "I&SO 8601 (eksempel: 15:47)" +msgstr "IS&O 8601 (eksempel: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:124 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adresser understøttes ikke med SOCKS4-proxy" @@ -4277,7 +4345,7 @@ "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:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4285,7 +4353,7 @@ "Hvis ændringen i værtsnøglen ikke var forventet, skal du kontakte serverens " "administrator." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4293,7 +4361,7 @@ "Hvis problemet vedbliver, er der en router og/eller firewall, der bliver ved " "at blokere for FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4311,7 +4379,7 @@ "tilføje \".1\" efter filnavnet (og derved evt. overskrive ældre logfiler), " "og en ny fil oprettes." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../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." @@ -4319,7 +4387,7 @@ "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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4327,11 +4395,11 @@ "Hvis problemet vedbliver, skal du kontakte fabrikanten af din router for at " "finde en løsning." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../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:1441 +#: ../../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 " @@ -4362,7 +4430,7 @@ "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:1184 +#: ../../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." @@ -4386,7 +4454,7 @@ "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:584 +#: ../../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 " @@ -4421,7 +4489,7 @@ "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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4429,16 +4497,16 @@ "Hvis din router bliver ved at ændre IP-adresse, kan du kontakte fabrikanten " "af din router." -#: ../../locales/../src/interface/import.cpp:80 +#: ../../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:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Import-indstillinger" -#: ../../locales/../src/interface/import.cpp:66 -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:76 msgid "Import successful" msgstr "Import fuldført" @@ -4482,7 +4550,7 @@ "serveren om en port, og opretter forbindelse til den givne port. Dette " "kræver ikke meget konfiguration." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4490,7 +4558,7 @@ "Kæde ikke komplet - øverste certifikat er ikke selv-signeret certifikat fra " "autoriseret certifikat-udsteder" -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Forkert adgangskode" @@ -4502,17 +4570,21 @@ "Oplysninger om den seneste version af FileZilla kunne ikke hentes. Prøv igen " "senere." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:733 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Initialiserer TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:717 +#: ../../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:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:184 +#: ../../locales/../src/engine/server.cpp:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4520,29 +4592,29 @@ msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Afbrudt af signal" -#: ../../locales/../src/engine/ControlSocket.cpp:216 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../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:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Ugyldig Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Ugyldig HTTP Response" -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Ugyldig parameter overført" -#: ../../locales/../src/engine/ControlSocket.cpp:451 -#: ../../locales/../src/engine/ControlSocket.cpp:507 +#: ../../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." @@ -4550,18 +4622,19 @@ "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:851 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Ugyldig chunk-størrelse" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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:40 -#: ../../locales/../src/interface/verifycertdialog.cpp:53 +#: ../../locales/../src/interface/verifycertdialog.cpp:41 +#: ../../locales/../src/interface/verifycertdialog.cpp:55 msgid "Invalid date" msgstr "Ugyldig dato" @@ -4574,7 +4647,7 @@ 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:102 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Ugyldig indtastning" @@ -4599,40 +4672,40 @@ "ftps:// til FTP via TLS (implicit) og\n" "ftpes:// til FTP via TLS (eksplicit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4249 +#: ../../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:377 +#: ../../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:597 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Ugyldig svarkode" -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Ugyldige søgebetingelser: %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: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:718 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" msgstr "Ugyldig størrelse i betingelse" @@ -4640,23 +4713,23 @@ msgid "Invalid username given." msgstr "Ugyldigt brugernavn angivet." -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Ugyldig værdi for ai_flags" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Ugyldig værdi til tips" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Jurisdiktion (land):" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Jurisdiktion (by):" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Jurisdiktion (stat eller provins):" @@ -4664,7 +4737,7 @@ msgid "Keep directories on top" msgstr "Hold mapper øverst" -#: ../../locales/../src/interface/Mainfrm.cpp:659 +#: ../../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 " @@ -4675,7 +4748,7 @@ "nogle tests for at se om serveren understøtter denne funktion, kan testen " "godt fejle." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "Nøgleudveksling" @@ -4683,6 +4756,13 @@ 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" @@ -4692,13 +4772,13 @@ msgid "Language" msgstr "Sprog" -#: ../../locales/../src/interface/Mainfrm.cpp:1492 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Sprog ændret" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:376 +#: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" msgstr "Sidst ændret" @@ -4726,7 +4806,7 @@ msgid "Limit:" msgstr "Grænse:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Linielængde oversteget" @@ -4734,13 +4814,14 @@ msgid "Linked against" msgstr "Linket mod" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../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: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 "Liste:" @@ -4748,42 +4829,42 @@ msgid "Lo&west available port:" msgstr "La&veste nr. port til rådighed:" -#: ../../locales/../src/interface/edithandler.cpp:1145 -#: ../../locales/../src/interface/edithandler.cpp:1399 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Lokal adresse i brug" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../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:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Den lokale fil findes ikke." -#: ../../locales/../src/interface/updater.cpp:434 -#: ../../locales/../src/interface/updater.cpp:526 +#: ../../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:308 +#: ../../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:349 +#: ../../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:1063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Lokale filtre:" @@ -4791,7 +4872,7 @@ msgid "Local site:" msgstr "Lokalt sted:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Lokalitet:" @@ -4799,12 +4880,16 @@ 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:791 +#: ../../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." @@ -4813,7 +4898,7 @@ "muligvis ikke UTF-8. Kan ikke falde tilbage på lokalt tegnsæt, da proxy " "anvendes." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:798 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4821,7 +4906,7 @@ "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:825 +#: ../../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." @@ -4840,17 +4925,17 @@ "Login-typen kan kun anvendes sammen med FTP-URL. Argumentet skal være enten " "'%s' eller '%s'" -#: ../../locales/../src/interface/queue.cpp:878 -#: ../../locales/../src/interface/queue.cpp:965 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Lav" -#: ../../locales/../src/interface/queue.cpp:876 -#: ../../locales/../src/interface/queue.cpp:963 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Lavest" -#: ../../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 "Laveste port til rådighed skal være et tal mellem 1024 og 65535." @@ -4858,49 +4943,49 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:43 +#: ../../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:792 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../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:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Forkert formet header: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 +#: ../../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: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: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:2990 +#: ../../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:2991 +#: ../../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:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Match intet af det følgende" @@ -4908,12 +4993,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Maksimalt antal samtidige &overførsler:" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Fejl ved tildeling af hukommelse" -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1819 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Beskedlog" @@ -4921,7 +5006,7 @@ msgid "Message log position" msgstr "Placering af beskedlog" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Besked er for stor" @@ -4929,29 +5014,29 @@ msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "minutter" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Flyt &ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Flyt &op" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Denne Computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Dokumenter" -#: ../../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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Mine steder" @@ -4960,22 +5045,21 @@ msgid "N/a" msgstr "I/A" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Navn" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../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:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../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 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 msgid "Name:" msgstr "Navn:" @@ -4983,31 +5067,31 @@ msgid "Natural sort" msgstr "Naturlig sortering" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../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:363 +#: ../../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:1005 +#: ../../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:1084 +#: ../../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:1071 +#: ../../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:473 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Netværk kan ikke tilgås" @@ -5023,33 +5107,33 @@ msgid "New &tab" msgstr "Ny &fane" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../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:2560 +#: ../../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:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2076 +#: ../../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:1126 +#: ../../locales/../src/interface/LocalTreeView.cpp:1123 #: ../../locales/../src/interface/RemoteListView.cpp:1306 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1255 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "Ny mappe" @@ -5062,13 +5146,13 @@ msgid "New filter" msgstr "Nyt filter" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" msgstr "Ny mappe" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2052 +#: ../../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" @@ -5076,11 +5160,11 @@ msgid "Next to the transfer queue" msgstr "Ved siden af overførselskøen" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Nej" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Ingen adresse associeret med nodenavn" @@ -5088,15 +5172,15 @@ msgid "No category to export selected" msgstr "Ingen kategori til eksport valgt" -#: ../../locales/../src/interface/QueueView.cpp:2143 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Ingen kommando afgivet, afslutter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3788 +#: ../../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:1086 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Der redigeres aktuelt ingen filer." @@ -5114,67 +5198,67 @@ msgid "No images available" msgstr "Ingen billeder til rådighed" -#: ../../locales/../src/interface/QueueView.cpp:3005 +#: ../../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:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../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:2955 +#: ../../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:2872 +#: ../../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:1058 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Ingen rute til vært" -#: ../../locales/../src/interface/search.cpp:227 +#: ../../locales/../src/interface/search.cpp:255 msgid "No search results" msgstr "Ingen søgeresultater" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Ingen sider til rådighed" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Ingen understøttet SOCKS5 aut-metode" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../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:59 +#: ../../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:2356 msgid "None selected yet" msgstr "Ingen er valgt endnu" -#: ../../locales/../src/engine/socket.cpp:1078 +#: ../../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: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/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" @@ -5183,16 +5267,16 @@ 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:185 -#: ../../locales/../src/interface/state.cpp:492 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Ikke tilsluttet" -#: ../../locales/../src/interface/RemoteListView.cpp:2022 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Ikke forbundet til nogen server" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Ikke forbundet til nogen server." @@ -5200,11 +5284,11 @@ msgid "Not connected." msgstr "Ikke tilsluttet." -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../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:657 +#: ../../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." @@ -5226,39 +5310,43 @@ 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:1930 +#: ../../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: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: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 " @@ -5267,7 +5355,7 @@ "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:834 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Én gang" @@ -5279,11 +5367,11 @@ msgid "Once a week" msgstr "En gang om ugen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../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:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Åbn mappe i systemets filhåndtering" @@ -5307,14 +5395,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Åbn FileZillas indstillingsvindue" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Åbnet som:" -#: ../../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: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" @@ -5331,23 +5419,23 @@ "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:777 -msgid "Operating system" -msgstr "Operativsystem" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Handling er allerede i gang" -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Handling i gang" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Handling ikke understøttet" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisation:" @@ -5355,16 +5443,16 @@ msgid "Other SFTP options" msgstr "Flere SFTP-indstillinger" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Anden systemfejl" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Andet:" -#: ../../locales/../src/engine/socket.cpp:1044 -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Ikke mere hukommelse" @@ -5376,30 +5464,30 @@ msgid "Overwrite &if source newer" msgstr "Overskriv &hvis kilden er nyere" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 +#: ../../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:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 +#: ../../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:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 +#: ../../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:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 +#: ../../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" @@ -5413,7 +5501,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Overskriv hvis forskellig str. eller kilden &er nyere" -#: ../../locales/../src/interface/updater.cpp:282 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Egen byg-type: %s\n" @@ -5422,8 +5510,8 @@ msgid "Owner permissions" msgstr "Ejertilladelser" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:378 +#: ../../locales/../src/interface/search.cpp:114 msgid "Owner/Group" msgstr "Ejer/Gruppe" @@ -5438,7 +5526,7 @@ msgid "P&roxy host:" msgstr "P&roxy-vært:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommando forstyrret af router eller firewall." @@ -5446,18 +5534,18 @@ msgid "Pa&ssive (recommended)" msgstr "&Passiv (anbefalet)" -#: ../../locales/../src/interface/Mainfrm.cpp:2388 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parameter er ikke en gyldig URL" -#: ../../locales/../src/interface/updater.cpp:606 +#: ../../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:2447 +#: ../../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 "&Adgangskode:" @@ -5470,39 +5558,39 @@ msgid "Passive mode" msgstr "Passiv tilstand" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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/settings/optionspage_connection_sftp.cpp:283 +#: ../../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:81 +#: ../../locales/../src/interface/search.cpp:109 msgid "Path" msgstr "Sti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3083 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2222 +#: ../../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:2345 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Sti ikke fundet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Stier" -#: ../../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: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" @@ -5510,13 +5598,13 @@ msgid "Permission" msgstr "Tilladelse" -#: ../../locales/../src/engine/socket.cpp:1037 -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Tilladelse nægtet" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:377 +#: ../../locales/../src/interface/search.cpp:113 msgid "Permissions" msgstr "Tilladelser" @@ -5524,7 +5612,7 @@ msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5540,11 +5628,11 @@ "Konfigurer evt. firewalls og routere, så FileZilla kan etablere en udgående " "forbindelse til en hvilken som helst port." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5560,7 +5648,7 @@ msgid "Please enter a custom time format." msgstr "Angiv et brugerdefineret klokkeslætformat." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:732 +#: ../../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." @@ -5579,7 +5667,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Angiv et nyt navn for det kopierede filter." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../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\"" @@ -5609,7 +5697,7 @@ msgid "Please enter a password for this server:" msgstr "Angiv en adgangskode til denne server:" -#: ../../locales/../src/interface/QueueView.cpp:2132 +#: ../../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" @@ -5625,7 +5713,7 @@ msgstr "" "Vælg en timeout mellem 10 og 9999 sekunder eller 0 for at slå timeout fra." -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../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" @@ -5633,11 +5721,11 @@ msgid "Please enter a username for this server:" msgstr "Angiv et brugernavn til denne server:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Angiv et gyldigt interval af portnumre." -#: ../../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 "Angiv den URL, hvorfra din eksterne adresse skal hentes" @@ -5647,7 +5735,7 @@ 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:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5655,14 +5743,14 @@ "Angiv en rå FTP-kommando.\n" "Ved anvendelse af rå FTP-kommandoer slettes mappe-cache." -#: ../../locales/../src/interface/LocalListView.cpp:897 -#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/LocalListView.cpp:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 #: ../../locales/../src/interface/RemoteListView.cpp:1293 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1241 +#: ../../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:2629 +#: ../../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:" @@ -5670,12 +5758,12 @@ msgid "Please enter username and password for this server:" msgstr "Angiv et brugernavn og en adgangskode til denne server:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Angiv din eksterne IP-adresse" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5693,7 +5781,7 @@ "Følg instruktionerne omhyggeligt, eftersom en forkert konfiguration vil " "forhindre korrekte FTP-forbindelser." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5701,11 +5789,11 @@ "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:136 +#: ../../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:609 +#: ../../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 " @@ -5729,7 +5817,7 @@ "heste eller andet malware. Dette kan give anledning til en falsk alarm, som " "du kan afvise med sindsro." -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../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." @@ -5745,7 +5833,7 @@ "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:585 +#: ../../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 " @@ -5754,11 +5842,11 @@ "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:3191 +#: ../../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:1627 +#: ../../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." @@ -5789,7 +5877,7 @@ 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:596 +#: ../../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. " @@ -5807,8 +5895,8 @@ msgid "Positio&n of the message log:" msgstr "&Placering af beskedloggen:" -#: ../../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 "Postnummer:" @@ -5820,12 +5908,12 @@ msgid "Preallocation" msgstr "Afsat plads" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../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:696 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Bevarer fil-tidsstempler" @@ -5833,7 +5921,7 @@ msgid "Preview:" msgstr "Visning:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../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." @@ -5850,7 +5938,7 @@ msgid "Prioritize directories (default)" msgstr "Prioriter mapper (standard)" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Prioritet" @@ -5880,15 +5968,21 @@ msgid "Process &Queue" msgstr "Udfør &kø" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Overløb i proces-filtabel" -#: ../../locales/../src/engine/socket.cpp:1047 +#. @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:1101 +#: ../../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" @@ -5905,36 +5999,40 @@ msgid "Proxy &user:" msgstr "Pro&xy-bruger:" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Validering af proxy fejlede" -#: ../../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-handshake fejlede: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243 +#: ../../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:312 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Proxy-svar: %s" -#: ../../locales/../src/engine/proxy.cpp:367 -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../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:519 +#: ../../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:4272 +#: ../../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" @@ -5950,7 +6048,7 @@ msgid "Public permissions" msgstr "Offentlige tilladelser" -#: ../../locales/../src/interface/QueueView.cpp:3085 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Køen er fuldt behandlet" @@ -5969,11 +6067,11 @@ msgid "Queue: empty" msgstr "Kø: tom" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Filer i kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Sætter i kø:" @@ -5985,12 +6083,12 @@ msgid "R&emote directory tree" msgstr "Fjernmappe&træ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../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:596 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Rå FTP-kommando" @@ -6007,7 +6105,7 @@ msgid "Re&name" msgstr "Om&døb" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6023,12 +6121,12 @@ msgid "Read-only" msgstr "Læsbar" -#: ../../locales/../src/interface/Mainfrm.cpp:1048 +#: ../../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:736 +#: ../../locales/../src/interface/search.cpp:740 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6038,7 +6136,7 @@ msgstr[1] "Ønsker du at slette %d mapper med deres indhold?" #: ../../locales/../src/interface/RemoteListView.cpp:1380 -#: ../../locales/../src/interface/search.cpp:734 +#: ../../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?" @@ -6046,27 +6144,27 @@ msgstr[1] "Ønsker du at slette %d filer?" #: ../../locales/../src/interface/RemoteListView.cpp:1387 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../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:1057 +#: ../../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/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 "" "Ønsker du virkelig at slette alle valgte filer og/eller mapper fra din " "computer?" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Årsag" -#: ../../locales/../src/interface/QueueView.cpp:3078 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Genstart nu" @@ -6074,36 +6172,36 @@ msgid "Rec&urse into subdirectories" msgstr "Rek&ursivt i undermapper" -#: ../../locales/../src/engine/tlssocket.cpp:198 +#: ../../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:2988 +#: ../../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:2015 -#: ../../locales/../src/engine/directorylistingparser.cpp:2029 +#: ../../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:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../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:585 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Modtaget ugyldige tegn i versionsoplysninger" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../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:578 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Modtog versionsoplysninger, der er for store" @@ -6125,13 +6223,25 @@ msgid "Reconnects to the last used server" msgstr "Genopret forbindelse til sidst anvendte server" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../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:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../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" @@ -6141,40 +6251,40 @@ msgid "Refresh the file and folder lists" msgstr "Genopfrisk fil- og mappelisterne" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Husk adgangskoder?" -#: ../../locales/../src/interface/edithandler.cpp:1108 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" msgstr "Fjern" -#: ../../locales/../src/engine/tlssocket.cpp:833 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Fjern-certifikat ikke sikkert." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../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: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/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:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Fjerne filtre:" -#: ../../locales/../src/interface/edithandler.cpp:1099 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Sti på fjernsted" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../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 " @@ -6183,7 +6293,7 @@ "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:1084 +#: ../../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 " @@ -6193,49 +6303,49 @@ "og at den er understøttet af den servertype (%s), der er valgt på det " "overordnede sted." -#: ../../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: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:331 +#: ../../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:3109 +#: ../../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:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Sti på fjernsted:" -#: ../../locales/../src/interface/viewheader.cpp:533 +#: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" msgstr "Fjernsted:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../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:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../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:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../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/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Omdøb fil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../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" @@ -6244,72 +6354,72 @@ msgid "Rename selected files and directories" msgstr "Omdøb valgte filer og mapper" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3422 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2421 +#: ../../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:3385 +#: ../../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:358 +#: ../../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:361 +#: ../../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:355 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Forespørgsel afvist eller fejlet" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../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:529 +#: ../../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:461 +#: ../../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:1089 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Ukendt protokol" -#: ../../locales/../src/engine/ControlSocket.cpp:1076 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../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:1048 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Ressourcen er ikke til rådighed for øjeblikket" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Respons:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Resultater:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../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" @@ -6323,19 +6433,19 @@ "Genoptagelse af hentning af ASCII-filer kan give problemer, hvis serveren " "anvender et andet linieafslutningsformat end klienten." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1263 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../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:1260 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Henter mappeliste..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../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" @@ -6352,7 +6462,7 @@ msgid "S&hutdown system" msgstr "L&uk systemet ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "S&top" @@ -6372,7 +6482,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:137 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-proxy forbinder til: %s" @@ -6381,34 +6491,34 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Gem indstillinger?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../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:438 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../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:1718 +#: ../../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:1720 +#: ../../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:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Søge&betingelser:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Søg i &mappe:" @@ -6424,12 +6534,12 @@ msgid "Security information" msgstr "Sikkerhedsinformation" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../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:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "V&ælg server" @@ -6448,7 +6558,7 @@ "Vælg standardhandling, der skal udføres, hvis filen i en overførsel allerede " "findes på destinationen." -#: ../../locales/../src/interface/edithandler.cpp:1562 +#: ../../locales/../src/interface/edithandler.cpp:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Vælg standard-editor" @@ -6468,7 +6578,7 @@ msgstr "" "Vælg standardhandling for fil findes for de aktuelt valgte filer i køen." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:359 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Vælg filen med den private nøgle" @@ -6477,6 +6587,7 @@ 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ø" @@ -6485,7 +6596,7 @@ msgstr "Vælg fil til eksporterede indstillinger" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2104 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "Vælg fil til eksporterede steder" @@ -6493,35 +6604,35 @@ msgid "Select file to import settings from" msgstr "Vælg fil at importere indstillinger fra" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Vælg fil til upload" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:305 -msgid "Select filename for converted keyfile" +#: ../../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:2877 +#: ../../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:482 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Vælg målmappe til download" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Vælg navn på destinationsfil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../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:1477 +#: ../../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:450 +#: ../../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." @@ -6535,7 +6646,7 @@ msgstr[0] "Valgt %d mappe." msgstr[1] "Valgt %d mapper." -#: ../../locales/../src/interface/search.cpp:448 +#: ../../locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6556,7 +6667,7 @@ 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:454 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Valgt %s og %s til overførsel." @@ -6571,34 +6682,34 @@ 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:1507 -#: ../../locales/../src/interface/edithandler.cpp:1582 +#: ../../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:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../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:388 +#: ../../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:1680 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "Den valgte fil er allerede åbnet" -#: ../../locales/../src/interface/edithandler.cpp:1752 +#: ../../locales/../src/interface/edithandler.cpp:1720 msgid "Selected file is still being edited" msgstr "Den valgte fil redigeres stadig" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../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:307 +#: ../../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." @@ -6619,34 +6730,34 @@ 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:4350 +#: ../../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:227 +#: ../../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:292 msgid "Server &Type:" msgstr "Servert&ype:" -#: ../../locales/../src/engine/tlssocket.cpp:722 +#: ../../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:878 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:931 +#: ../../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:4184 +#: ../../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:4180 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6655,15 +6766,15 @@ "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:2457 +#: ../../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:2453 +#: ../../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:4195 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6672,7 +6783,7 @@ "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:827 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6680,24 +6791,24 @@ "Serveren kræver muligvis en konto. Prøv at angive en konto vha. Websted " "Manager" -#: ../../locales/../src/engine/ControlSocket.cpp:340 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Serveren sendte en tom sti." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../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:3748 +#: ../../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:3742 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6706,35 +6817,35 @@ "serveradressen istedet." #: ../../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: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:2057 +#: ../../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:2047 +#: ../../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:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Servert&ype:" -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Server/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:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Server:" @@ -6746,13 +6857,13 @@ msgid "Set &Priority" msgstr "Sæt &prioritet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2300 +#: ../../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:767 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize blev kaldt uden socket" @@ -6760,6 +6871,10 @@ 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" @@ -6768,7 +6883,7 @@ msgid "Show &welcome dialog..." msgstr "Vis &velkomstdialog..." -#: ../../locales/../src/interface/Mainfrm.cpp:2235 +#: ../../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?" @@ -6780,7 +6895,7 @@ 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:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 msgid "Shows available TLS ciphers" msgstr "Viser tilgængelige TLS-koder" @@ -6788,7 +6903,7 @@ msgid "Shows this help dialog" msgstr "Viser denne hjælpedialog" -#: ../../locales/../src/interface/QueueView.cpp:3074 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Luk ned nu" @@ -6796,7 +6911,7 @@ msgid "Signature algorithm:" msgstr "Signaturalgoritme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "Websted Manager liste" @@ -6804,55 +6919,56 @@ msgid "Site Manager" msgstr "Websted Manager" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../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: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: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:1103 +#: ../../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:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 msgid "Site Manager already open" msgstr "Websted Manager allerede åben" -#: ../../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: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:426 +#: ../../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:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../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:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" msgstr "Sted-specifikke bogmærker" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../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" @@ -6861,7 +6977,7 @@ "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:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Størrelse" @@ -6873,50 +6989,50 @@ msgid "Size unknown" msgstr "Størrelse ukendt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../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:1147 -#: ../../locales/../src/engine/ControlSocket.cpp:1164 -#: ../../locales/../src/engine/ControlSocket.cpp:1188 -#: ../../locales/../src/engine/ControlSocket.cpp:1249 +#: ../../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:1151 -#: ../../locales/../src/engine/ControlSocket.cpp:1167 -#: ../../locales/../src/engine/ControlSocket.cpp:1192 -#: ../../locales/../src/engine/ControlSocket.cpp:1253 +#: ../../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:1052 +#: ../../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:1054 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket allerede tilsluttet" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Socket er lukket ned" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket ikke tilsluttet" -#: ../../locales/../src/engine/socket.cpp:1102 +#: ../../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:1183 +#: ../../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." @@ -6933,7 +7049,7 @@ msgid "Sort directories inline" msgstr "Sorter alfabetisk" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../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." @@ -6945,11 +7061,11 @@ msgid "Sorting &mode:" msgstr "Sorterings&metode:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../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/settings/optionspage_connection_sftp.cpp:315 +#: ../../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" @@ -6961,7 +7077,7 @@ msgid "Source file:" msgstr "Kildefil:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 +#: ../../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" @@ -6991,7 +7107,7 @@ msgid "Stable, beta and nightly versions" msgstr "Stabile, betaversioner og daglige byg" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Start overførsel &straks" @@ -6999,19 +7115,19 @@ msgid "Start with opened Site Manager" msgstr "Start med åben Websted Manager" -#: ../../locales/../src/interface/updater.cpp:276 +#: ../../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:2167 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1548 +#: ../../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:2170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1551 +#: ../../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" @@ -7020,18 +7136,18 @@ msgid "Starts the local site in the given path" msgstr "Starter det lokale websted på den givne sti" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Stat eller provins:" -#: ../../locales/../src/interface/edithandler.cpp:1100 -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7039,7 +7155,11 @@ msgid "Stop and remove &all" msgstr "Stop og fjern &alle" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../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:" @@ -7055,11 +7175,11 @@ msgid "Summary of test results:" msgstr "Opsummering af testresultater:" -#: ../../locales/../src/interface/QueueView.cpp:3082 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Stop midlertidigt nu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7067,23 +7187,24 @@ "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: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/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:380 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synkroniseret bladring er slået fra." @@ -7097,8 +7218,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Syntaksfejl i kommandolinie" @@ -7106,11 +7227,15 @@ msgid "System" msgstr "System" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../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:1100 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Systemets netværksundersystem har fejlet" @@ -7118,19 +7243,19 @@ msgid "T&oolbar" msgstr "&Værktøjslinje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../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:375 +#: ../../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:378 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS-forbindelse etableret." -#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL udløbet" @@ -7142,15 +7267,15 @@ msgid "Target file:" msgstr "Destinationsfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2645 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Destinationsfilnavnet findes allerede!" -#: ../../locales/../src/interface/RemoteListView.cpp:1599 +#: ../../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:1073 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Midlertidig fejl i navneopløsning" @@ -7158,11 +7283,15 @@ msgid "Test results" msgstr "Testresultater" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4201 +#: ../../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:329 +#: ../../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 " @@ -7180,30 +7309,25 @@ "Websted Manager er åben i en anden instans af FileZilla 3.\n" "Luk den venligst eller det valgte kan ikke slettes." -#: ../../locales/../src/interface/xmlfunctions.cpp:389 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "XML-dokumentet er ikke velformet: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../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:1079 +#: ../../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:1092 +#: ../../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:802 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../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:796 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Bogmærkerne kunne ikke ryddes." @@ -7229,17 +7353,17 @@ "Det brugerdefinerede klokkeslætformat er ugyldigt eller indeholder " "formatangivelser, der ikke er understøttede." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../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:2895 -#: ../../locales/../src/interface/edithandler.cpp:1542 +#: ../../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:2888 +#: ../../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'." @@ -7250,13 +7374,13 @@ 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:154 +#: ../../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: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" @@ -7265,8 +7389,8 @@ "Filen %s findes allerede.\n" "Angiv et nyt navn:" -#: ../../locales/../src/interface/edithandler.cpp:1653 -#: ../../locales/../src/interface/LocalListView.cpp:1698 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7277,18 +7401,27 @@ "Kunne ikke finde det tilknyttede program (%s).\n" "Kontroller dine filtypetilknytninger." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:226 +#: ../../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:41 +#: ../../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:1648 -#: ../../locales/../src/interface/LocalListView.cpp:1694 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7297,8 +7430,8 @@ "Filen '%s' kunne ikke åbnes:\n" "Intet program i dit system er associeret med denne filtype." -#: ../../locales/../src/interface/edithandler.cpp:1765 -#: ../../locales/../src/interface/LocalListView.cpp:1706 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7307,20 +7440,20 @@ "Filen '%s' kunne ikke åbnes:\n" "Den associerede kommando fejlede" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, 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 "" -"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?" +"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/settings/optionspage_connection_sftp.cpp:269 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7329,22 +7462,11 @@ "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_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 "" -"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?" - #: ../../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:79 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7358,11 +7480,11 @@ "blive importeret.\n" "Fortsæt med at importere?" -#: ../../locales/../src/interface/listctrlex.cpp:745 +#: ../../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:798 +#: ../../locales/../src/interface/listctrlex.cpp:809 msgid "The filename column cannot be hidden." msgstr "Filnavn-kolonnen kan ikke skjules." @@ -7376,15 +7498,15 @@ msgid "The following characters will be replaced: %s" msgstr "Følgende tegn vil blive erstattet: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../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:3263 +#: ../../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:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 msgid "The global bookmarks could not be saved." msgstr "De globale bogmærker kunne ikke gemmes." @@ -7401,7 +7523,17 @@ 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:255 +#: ../../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" @@ -7410,7 +7542,7 @@ "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: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." @@ -7426,11 +7558,16 @@ 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:1840 +#: ../../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:958 +#: ../../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" @@ -7439,26 +7576,26 @@ "Fjernmappen (%s) er ikke under sykroniseringsroden (%s).\n" "Slå synkroniseret bladring fra, og fortsæt med at skifte fjernmappe?" -#: ../../locales/../src/interface/import.cpp:69 +#: ../../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:1603 +#: ../../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:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../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:1752 +#: ../../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:1658 +#: ../../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" @@ -7468,15 +7605,15 @@ "Dette kan være farligt, og kan skade dit system.\n" "Ønsker du virkelig at fortsætte?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Serveren kunne ikke tilføjes." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../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:456 +#: ../../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:" @@ -7488,7 +7625,7 @@ "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: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 " @@ -7499,7 +7636,7 @@ "faktisk forsøger at tilslutte dig til en anden compter, der lader som om den " "er serveren." -#: ../../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." @@ -7507,11 +7644,11 @@ "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:1091 +#: ../../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:66 +#: ../../locales/../src/interface/import.cpp:73 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7519,19 +7656,19 @@ "Indstillingerne er blevet importeret. Du skal genstarte FileZilla før " "indstillingerne træder i kraft." -#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../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:1104 +#: ../../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:3077 +#: ../../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:3073 +#: ../../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." @@ -7543,11 +7680,11 @@ "Destinationsfilen findes allerede.\n" "Vælg en handling." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../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:77 +#: ../../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" @@ -7556,15 +7693,15 @@ msgid "Themes" msgstr "Temaer" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../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:385 +#: ../../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:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7587,7 +7724,7 @@ "Denne assistent hjælper til at konfigurere evt. routere og firewalls, du " "måtte have, og tester din konfiguration." -#: ../../locales/../src/interface/queue.cpp:1182 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Tidspunkt" @@ -7600,25 +7737,25 @@ msgstr "&Timeout i sekunder:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1642 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1022 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2233 +#: ../../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:2234 +#: ../../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." @@ -7682,17 +7819,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Slå visning af overførselskøen til eller fra" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Header-linie for lang" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "For mange omdirigeringer" -#: ../../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 "Spor:" @@ -7701,7 +7838,7 @@ msgid "Transfer" msgstr "Overfør" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "Overførsels&retning" @@ -7717,21 +7854,21 @@ msgid "Transfer Queue" msgstr "Overførselskø" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 msgid "Transfer Settings" msgstr "Overførselsindstillinger" -#: ../../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 "Overførselsforbindelsen afbrudt: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Overførte data er forstyrret." -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Overfører" @@ -7740,8 +7877,7 @@ msgid "Transfers" msgstr "Overførsler" -#: ../../locales/../src/interface/QueueView.cpp:2975 -#: ../../locales/../src/interface/QueueView.cpp:2978 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Overførsler afsluttet" @@ -7753,15 +7889,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandl &følgende filtyper som ASCII-filer:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Stol på ændret værtsnøgle:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Stol på ny værtsnøgle:" -#: ../../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 "Hav tillid til den nye nøgle, og fortsæt tilslutning?" @@ -7769,7 +7905,7 @@ 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:872 +#: ../../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?" @@ -7778,8 +7914,8 @@ msgid "Try again" msgstr "Prøv igen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Type" @@ -7791,11 +7927,11 @@ msgid "Type of generic proxy:" msgstr "Type af generisk proxy:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "U&pload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 +#: ../../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:" @@ -7805,33 +7941,33 @@ msgstr "B&rug filtypeassociationer hvor muligt" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Brug systemst&andard" +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:364 -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../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:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Enhed:" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1158 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Ukendt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:673 +#: ../../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:412 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Ukendt version af SOCKS-protokol: %d" @@ -7840,20 +7976,11 @@ msgid "Unknown certificate" msgstr "Ukendt certifikat" -#: ../../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 "" -"Ukendt fejl ved åbning af filen. Sørg for, at der er adgang til filen, og at " -"den er et velformet XML-dokument." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Ukendt værtsnøgle" -#: ../../locales/../src/engine/proxy.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7862,14 +7989,14 @@ "Ukendt protokolversion ved subnegotiering af SOCKS brugernavn/adgangskode-" "validering: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:420 +#: ../../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:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -7877,7 +8004,7 @@ "Medmindre disse problemer løses, vil FTP i aktiv tilstand ikke fungere, og " "du skal anvende passiv tilstand." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -7885,15 +8012,15 @@ "Medmindre dette problem løses, vil FTP i aktiv tilstand ikke fungere, og du " "skal anvende passiv tilstand." -#: ../../locales/../src/engine/tlssocket.cpp:1017 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Certifikat-type ikke understøttet" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Omdirigering ikke understøttet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "Up&load og ophæv redigering" @@ -7902,11 +8029,11 @@ msgid "Updates" msgstr "Opdateringer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Upload" -#: ../../locales/../src/interface/edithandler.cpp:1121 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "Upload fejlede" @@ -7919,7 +8046,7 @@ msgid "Upload limit: none" msgstr "Upload-grænse: ingen" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Upload valgte mappe" @@ -7927,72 +8054,72 @@ msgid "Upload selected files and directories" msgstr "Upload valgte filer og mapper" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../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:1721 +#: ../../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:1115 -#: ../../locales/../src/interface/edithandler.cpp:1149 -#: ../../locales/../src/interface/edithandler.cpp:1314 +#: ../../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:1118 -#: ../../locales/../src/interface/edithandler.cpp:1316 +#: ../../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:1152 -#: ../../locales/../src/interface/edithandler.cpp:1318 +#: ../../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:479 +#: ../../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 "Anvend &brugerdef. editor:" +msgstr "An&vend brugerdef. editor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../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:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../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:467 +#: ../../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:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../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:527 +#: ../../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:2307 +#: ../../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:2313 +#: ../../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" -msgstr "Brug systemstanda&rd" +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:" @@ -8027,17 +8154,12 @@ msgid "User:" msgstr "Bruger:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../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/engine/ftpcontrolsocket.cpp:4277 -#, c-format -msgid "Using proxy %s" -msgstr "Bruger proxy %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8055,19 +8177,15 @@ msgid "Verbose log messages from wxWidgets" msgstr "Log-meddelelser med mange ord fra wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Godkender certifikat..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Version:" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Meget høj" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../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" @@ -8075,7 +8193,7 @@ msgid "View/Edit" msgstr "Vis/Rediger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Synlige kolonner" @@ -8083,15 +8201,15 @@ msgid "W&rite" msgstr "Sk&riv" -#: ../../locales/../src/interface/QueueView.cpp:1678 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Venter" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Venter på browser-forbindelse" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Venter på adgangskode" @@ -8103,7 +8221,7 @@ msgid "Waiting to retry..." msgstr "Venter på at prøve igen..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Advarsel: Ignorerer dataforbindelse fra forkert IP." @@ -8122,15 +8240,15 @@ "\n" "Ønsker du virkelig at søge efter daglige byg?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Advarsel: Mulig sikkerhedsrisiko!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Velkommen til FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Sidste nye" @@ -8138,7 +8256,7 @@ msgid "What's new:" msgstr "Sidste nye:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../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." @@ -8158,13 +8276,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 msgid "When st&arting a new connection while already connected:" -msgstr "Når du st&arter en ny forbindelse, mens du allerede er forbundet:" +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:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "Skal FileZilla huske adgangskoder?" @@ -8172,20 +8290,20 @@ msgid "Wr&ite" msgstr "Skr&iv" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../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:792 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Forkerte linieslut-tegn" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8197,7 +8315,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Du benytter den seneste version af FileZilla." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3402 +#: ../../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." @@ -8232,17 +8350,17 @@ "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:296 +#: ../../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:3181 +#: ../../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:1619 -#: ../../locales/../src/interface/search.cpp:700 +#: ../../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?" @@ -8250,7 +8368,7 @@ "Du har valgt at ville redigere mere end 10 filer - ønsker du virkelig at " "fortsætte?" -#: ../../locales/../src/interface/LocalListView.cpp:1664 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8258,35 +8376,39 @@ "Du har valgt at ville åbne mere end 10 filer eller mapper - ønsker du " "virkelig at fortsætte?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../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/search.cpp:493 +#: ../../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:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Du skal angive en gyldig IP-adresse." +#: ../../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:498 +#: ../../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:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../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:479 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018 +#: ../../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:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8301,7 +8423,7 @@ msgid "You need to enter a name for the log file." msgstr "Angiv et navn for logfilen." -#: ../../locales/../src/interface/edithandler.cpp:1503 +#: ../../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." @@ -8314,15 +8436,15 @@ 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:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../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: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:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../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:1134 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8330,7 +8452,7 @@ "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:1065 +#: ../../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." @@ -8338,23 +8460,23 @@ "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:302 +#: ../../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:319 +#: ../../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:325 +#: ../../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:296 +#: ../../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:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8362,7 +8484,7 @@ "Du burde ikke have problemer med at oprette forbindelse til andre servere, " "filoverførseler burde fungere korrekt." -#: ../../locales/../src/interface/QueueView.cpp:3081 +#: ../../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å " @@ -8381,7 +8503,7 @@ msgstr "begynder 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 "bytes" @@ -8389,7 +8511,7 @@ msgid "contains" msgstr "indeholder" -#: ../../locales/../src/interface/updater.cpp:280 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "brugerdefineret" @@ -8411,19 +8533,19 @@ msgid "equals" msgstr "svarer til" -#: ../../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: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:97 +#: ../../locales/../src/interface/edithandler.cpp:98 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: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 " @@ -8433,15 +8555,15 @@ "Sørg for, at denne eksekverbare fil findes i samme mappe som FileZillas " "eksekverbare fil." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../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:1475 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp kunne ikke startes" -#: ../../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 returnerede ingen certifikater" @@ -8497,10 +8619,11 @@ msgid "owner writeable" msgstr "skrivbar af ejer" -#: ../../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: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" @@ -8520,6 +8643,73 @@ 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" diff -Nru filezilla-3.14.1/locales/de.po filezilla-3.15.0.2/locales/de.po --- filezilla-3.14.1/locales/de.po 2015-09-16 12:05:46.000000000 +0000 +++ filezilla-3.15.0.2/locales/de.po 2016-02-05 08:54:46.000000000 +0000 @@ -1,13 +1,13 @@ # Translation for FileZilla Client - German # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: FileZilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-16 10:03+0200\n" -"PO-Revision-Date: 2015-09-15 00:32+0200\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-30 01:23+0100\n" "Last-Translator: Peter Körner <18427@gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -46,9 +46,9 @@ msgstr[0] "%d Verzeichnis" msgstr[1] "%d Verzeichnisse" -#: ../../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" @@ -57,9 +57,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" @@ -80,12 +80,12 @@ msgstr[0] "%d Datei. Gesamtgröße: mindestens %s" msgstr[1] "%d Dateien. Gesamtgröße: mindestens %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -125,7 +125,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Zertifikat abgelaufen!" @@ -157,7 +157,7 @@ msgstr[0] "%s Byte" msgstr[1] "%s Bytes" -#: ../../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 " @@ -172,7 +172,7 @@ "Bitte laden Sie FileZilla erneut herunter. Falls dieses Problem weiterhin " "auftritt, senden Sie bitte einen Fehlerbericht." -#: ../../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 " @@ -191,7 +191,7 @@ "- Geben Sie den vollständigen Pfad zu %s in der FZ_FZSFTP-Umgebungsvariable " "an." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s mit %d Bits" @@ -205,7 +205,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxy-Passwort" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Bestehende Verbindung unterbrechen und in aktuellem Tab verbinden" @@ -258,7 +258,7 @@ msgid "&Always use default editor" msgstr "&Immer Standardeditor verwenden" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Auswahl immer für Dateien ohne Zuordnung verwenden" @@ -296,9 +296,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 @@ -311,8 +311,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" @@ -385,14 +385,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 "&Löschen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Symbolische Verknüpfung löschen" @@ -400,14 +400,14 @@ msgid "&Directory comparison" msgstr "&Verzeichnisvergleich" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Synchronisierten Verzeichniswechsel deaktivieren und das lokale Verzeichnis " "wechseln" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -436,7 +436,7 @@ msgid "&Display size in bytes" msgstr "&Größe in Bytes anzeigen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Passwörter &nicht speichern (empfohlen)" @@ -457,7 +457,7 @@ msgid "&Download" msgstr "Herunterla&den" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Herunterladen nach:" @@ -490,7 +490,7 @@ msgid "&Enable compression" msgstr "&Kompression aktivieren" -#: ../../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 "&Geschwindigkeitsbegrenzungen aktivieren" @@ -507,7 +507,7 @@ msgid "&Enter custom command..." msgstr "B&enutzerdefinierten Befehl eingeben..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Verbindung in einem neuen Tab aufbauen" @@ -560,7 +560,7 @@ msgid "&Finish editing and delete local file" msgstr "Bearbeiten &beenden und lokale Datei löschen" -#: ../../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" @@ -568,7 +568,7 @@ "Dateipfad auf Server nicht berücksichtigen; Dateien direkt in das " "&Zielverzeichnis herunterladen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "" "Symbolischer &Verknüpfung folgen, Inhalt des Zielverzeichnisses löschen" @@ -632,7 +632,7 @@ msgid "&Install new version" msgstr "Neue Version &installieren" -#: ../../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 "" "Dateipfad wie auf &Server beibehalten (relativ zum Wurzelverzeichnis der " @@ -659,7 +659,7 @@ msgstr "&Lokaler Verzeichnisbaum" #: ../../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 "&Lokales Verzeichnis:" @@ -723,11 +723,11 @@ msgid "&New Site" msgstr "&Neuer Server" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Neue Version verfügbar!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Weiter >" @@ -750,7 +750,7 @@ msgstr "&Numerischer Wert:" #: ../../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 "&OK" @@ -827,12 +827,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "Passwo&rt merken, bis FileZilla geschlossen wird" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "S&erver-Verzeichnis:" @@ -853,7 +853,7 @@ msgstr "Auswahl &entfernen" #: ../../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 @@ -914,7 +914,7 @@ msgid "&Save as..." msgstr "&Speichern unter..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Suchen" @@ -983,7 +983,7 @@ msgid "&Speed limits" msgstr "&Geschwindigkeitsbegrenzungen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Übertragung sofort &starten" @@ -995,7 +995,7 @@ msgid "&TLS Ciphers" msgstr "&TLS-Chiffren" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Test" @@ -1038,7 +1038,7 @@ msgid "&Uploads:" msgstr "&Uploads:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Benutzerdefiniertes Programm verwenden" @@ -1072,7 +1072,7 @@ msgid "&Username:" msgstr "Ben&utzername:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Version %s" @@ -1118,12 +1118,12 @@ msgid "'%s' is not a directory." msgstr "'%s' ist kein Verzeichnis." -#: ../../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 "Anmeldung via 'Konto' wird vom gewählten Protokoll nicht unterstützt." -#: ../../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." @@ -1139,7 +1139,7 @@ "Anmeldung via 'Normal' oder 'Konto' ist nicht verfügbar. Ihr Eintrag wurde " "auf 'Nach Passwort fragen' geändert." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1197,8 +1197,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(Beispiel: %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 @@ -1257,7 +1257,7 @@ msgid "64-bit system" msgstr "64-Bit-System" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Zurück" @@ -1278,7 +1278,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Ein Verzeichnis kann nicht in eines seiner Unterverzeichnisse verschoben " @@ -1310,7 +1310,7 @@ "Eine Datei mit diesem Namen wird noch bearbeitet. Bitte schließen Sie diese " "und versuchen Sie es erneut." -#: ../../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 " @@ -1329,7 +1329,7 @@ msgid "A new version of FileZilla is available:" msgstr "Eine neue FileZilla-Version ist verfügbar:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1347,7 +1347,7 @@ "mit dem Serveradministrator in Verbindung, wenn Sie diese Einstellung " "dennoch benötigen." -#: ../../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?" @@ -1401,11 +1401,11 @@ #: ../../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: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" @@ -1431,7 +1431,7 @@ msgid "Active mode" msgstr "Aktiver Modus" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1439,7 +1439,7 @@ "Test für den aktiven FTP-Modus fehlgeschlagen. FileZilla kennt die korrekte " "externe IP-Adresse nicht." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1448,7 +1448,7 @@ "externe IP-Adresse nicht. Zusätzlich hat Ihr Router die gesendete Adresse " "verändert." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1462,7 +1462,7 @@ msgid "Active mode IP" msgstr "IP für aktiven Modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Dateien nur zur &Warteschlange hinzufügen" @@ -1482,7 +1482,7 @@ msgid "Add to queue" msgstr "Zur Warteschlange hinzufügen" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Adresstyp nicht unterstützt" @@ -1505,7 +1505,7 @@ "System beschädigen. Sie verwenden Beta-Versionen und Nightly Builds auf " "eigene Gefahr." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "I&mmer diese Aktion ausführen" @@ -1513,7 +1513,7 @@ msgid "Algorithm:" msgstr "Algorithmus:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Alle Dateien wurden erfolgreich übertragen" @@ -1522,7 +1522,7 @@ msgstr "" "Alle Ports im angegebenen Bereich müssen zwischen 1024 und 65535 liegen." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../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." @@ -1540,11 +1540,11 @@ 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:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Bereits verbunden" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativer Name:" @@ -1575,7 +1575,7 @@ "Alternativ können Sie die aktuelle Version auch von der FileZilla-Website " "herunterladen:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1585,7 +1585,7 @@ "aufgetreten.\n" "Möglicherweise wurden einige Warteschlangeneinträge nicht wiederhergestellt." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1595,23 +1595,23 @@ "aufgetreten.\n" "Möglicherweise wurden einige Warteschlangeneinträge nicht gespeichert." -#: ../../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 "Am Zielort ist bereits ein Eintrag mit diesem Namen vorhanden." #: ../../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/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:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1624,11 +1624,11 @@ "Keine der im Servermanager durchgeführten Änderungen konnte gespeichert " "werden." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Änderungen an den Filtern werden nicht gespeichert." @@ -1652,7 +1652,7 @@ msgid "Archive" msgstr "Archiv" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Argumentpuffer-Überlauf" @@ -1670,7 +1670,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Nach Passwort fragen" @@ -1682,7 +1682,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "In den FileZilla-Foren Fragen stellen" @@ -1703,7 +1703,7 @@ msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Authentifizierung fehlgeschlagen." @@ -1733,11 +1733,11 @@ msgstr "&Proxy umgehen" # TODO -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Ungültiger file descriptor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Grundlegende Verwendungshinweise" @@ -1750,7 +1750,7 @@ msgid "Being edited" msgstr "Wird bearbeitet" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Vorsicht! Zertifikat wurde widerrufen" @@ -1768,11 +1768,11 @@ msgid "Bookmark" msgstr "Lesezeichen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Lesezeichen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Lesezeichen" @@ -1788,7 +1788,7 @@ msgid "Build information" msgstr "Versionsinformationen" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Geschäftskategorie:" @@ -1827,22 +1827,22 @@ msgid "CPU features:" msgstr "CPU-Features:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Berechne Zeitzonenabweichung des Servers..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Kann nicht aus Datei lesen" -#: ../../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 "In die Datei kann nicht geschrieben werden." -#: ../../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 "In die Datei kann nicht geschrieben werden: %s" @@ -1860,13 +1860,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 "Abbrechen" @@ -1886,15 +1886,15 @@ "Kein Zugriff auf '%s' möglich, kein Datenträger im Laufwerk oder Laufwerk " "nicht bereit." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Kann Server nicht zum Servermanager hinzufügen" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Kann geforderte Adresse nicht zuweisen" -#: ../../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?" @@ -1916,20 +1916,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 "Kann die Datei nicht bearbeiten" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Kann Datei nicht bearbeiten, nicht mit einem Server verbunden." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Kann Datei nicht bearbeiten, Pfad auf Server unbekannt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1946,11 +1946,11 @@ msgid "Cannot load key file" msgstr "Kann Schlüsseldatei nicht laden" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Werkzeugleiste kann nicht aus Ressourcendatei geladen werden" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Kann Passwort nicht speichern" @@ -1959,22 +1959,22 @@ msgid "Cannot rename entry" msgstr "Kann Eintrag nicht umbenennen" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Kann Datei nicht umbenennen" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Kann Filtersatz nicht speichern" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Kann Filter nicht auswählen" @@ -2042,7 +2042,7 @@ msgstr "" "Das Ändern der Logdatei-Einstellungen erfordert einen FileZilla-Neustart." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Probleme mit Zeichensatz" @@ -2070,7 +2070,7 @@ msgid "Check for updates failed" msgstr "Suche nach Updates fehlgeschlagen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2078,7 +2078,7 @@ "Überprüfen Sie Ihre Logindaten. Das eingegebene Passwort beginnt oder endet " "mit einem Leerzeichen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2086,7 +2086,7 @@ "Überprüfen Sie Ihre Logindaten. Der eingegebene Benutzername beginnt oder " "endet mit einem Leerzeichen." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Überprüfe Korrektheit der externen IP-Adresse" @@ -2094,12 +2094,12 @@ msgid "Checking for updates..." msgstr "Suche nach Updates..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Übereinstimmung der Prüfsumme auf Datei %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Nicht-Übereinstimmung der Prüfsumme auf Datei %s\n" @@ -2114,11 +2114,11 @@ #: ../../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 "Lokales Verzeichnis auswählen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "HTTP-Datenblock nicht ordnungsgemäß terminiert" @@ -2156,7 +2156,7 @@ msgid "Clear quickconnect bar" msgstr "Quickconnect-Leiste leeren" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Klicken Sie auf Beenden, um Ihre Konfiguration zu speichern." @@ -2173,8 +2173,8 @@ msgstr "Andere Tabs &schließen" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "FileZilla beenden" @@ -2204,13 +2204,13 @@ "Der Befehl und seine Argumente sollten korrekt mit Anführungszeichen " "versehen sein." -#: ../../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 "Befehl fehlgeschlagen" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Befehl nicht unterstützt" @@ -2218,9 +2218,9 @@ msgid "Command not supported by this protocol" msgstr "Der Befehl wird von diesem Protokoll nicht unterstützt" -#: ../../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 "Befehl:" @@ -2228,12 +2228,12 @@ msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Allgemeiner Name:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Kommunikation vom Router oder der Firewall beeinträchtigt" @@ -2280,7 +2280,7 @@ msgstr "Gleichzeitige Übertragungen" #: ../../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 "&Groß-/Kleinschreibung berücksichtigen" @@ -2296,24 +2296,24 @@ msgid "Configure port range" msgstr "Portbereich einrichten" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "FileZilla und Ihr Netzwerk konfigurieren" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Löschen bestätigen" -#: ../../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 "Bestätigung erforderlich" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Herzlichen Glückwunsch, Ihre Konfiguration scheint zu funktionieren." @@ -2321,6 +2321,11 @@ msgid "Connect bypassing proxy settings" msgstr "Verbinden (Proxy-Einstellungen umgehen)" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Connect fehlgeschlagen: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "In aktuellem Tab verbinden" @@ -2333,29 +2338,25 @@ msgid "Connect to specified Site Manager site" msgstr "Mit angegebenem Server aus dem Servermanager verbinden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Verbunden" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Verbindung wird hergestellt" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Verbinde mit %s über %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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Verbinde mit %s..." @@ -2364,120 +2365,124 @@ msgid "Connection" msgstr "Verbindung" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Verbindung abgebrochen" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Verbindungsversuch fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Verbindungsversuch fehlgeschlagen mit \"%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 "Verbindungsversuch durch Benutzer unterbrochen" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Zeitüberschreitung bei Verbindungsversuch" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Verbindung getrennt" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Verbindung vom Server geschlossen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Verbindung hergestellt, initialisiere TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Verbindung hergestellt, schicke HTTP-Anfrage" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Verbindung hergestellt, warte auf Willkommensnachricht." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Verbindung hergestellt, warte auf Willkommensnachricht..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Verbindung verloren" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Verbindung durch den Regelsatz nicht erlaubt" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Verbindung verweigert" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Verbindung durch Server verweigert" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Verbindung durch Netzwerk zurückgesetzt" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Verbindung durch Peer zurückgesetzt" -#: ../../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] "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:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Zeitüberschreitung der Verbindung." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Verbindung zu Server verloren." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Verbindung mit Proxy hergestellt, führe Handshake durch..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Verbindung zum Server wurde vorzeitig getrennt." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Verbindung zum Testserver fehlgeschlagen." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Schlüsseldatei konvertieren" #: ../../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 "Kopie (%d) von %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 "Kopie von %s" @@ -2487,7 +2492,7 @@ 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:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Konnte Verbindung nicht akzeptieren: %s" @@ -2497,30 +2502,30 @@ msgid "Could not add connection to Site Manager" msgstr "Konnte Verbindung nicht in Servermanager aufnehmen" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Konnte Operation nicht abschließen" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Herstellen der Verbindung zum Server fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Herstellen der Verbindung zum Server fehlgeschlagen: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Befehl konnte nicht im Serverzeichensatz kodiert werden" -#: ../../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 "Konnte privaten Schlüssel nicht konvertieren" -#: ../../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 "Konnte URLs nicht kopieren" @@ -2528,17 +2533,17 @@ msgid "Could not copy data" msgstr "Konnte Daten nicht kopieren" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Konnte lokale Datei %s nicht erzeugen\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Konnte Logging-Mutex nicht erzeugen: %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" @@ -2549,11 +2554,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:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Konnte keine Verbindung zum Server aufbauen" -#: ../../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 " @@ -2566,11 +2571,11 @@ "Kommandozeilenoption '--datadir ' oder setzen Sie die " "Umgebungsvariable 'FZ_DATADIR'." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Es konnte keine benutzerdefinierte Anmeldesequenz erstellt werden." -#: ../../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" @@ -2578,7 +2583,7 @@ "Konnte 'Distinguished Name' des Zertifikatsausstellers nicht ermitteln; " "gnutls_x509_get_issuer_dn fehlgeschlagen" -#: ../../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" @@ -2586,27 +2591,32 @@ "Konnte 'Distinguished Name' des Zertifikat-Betreffs nicht ermitteln; " "gnutls_x509_get_dn fehlgeschlagen" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Konnte kompletten Pfad auf Server nicht bestimmen." -#: ../../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 "Keine Antwort von fzputtygen erhalten." #: ../../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 "Kann temporäres Download-Verzeichnis nicht finden." -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2630,11 +2640,11 @@ msgid "Could not load key file" msgstr "Konnte Schlüsseldatei nicht laden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Konnte privaten Schlüssel nicht laden" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2646,7 +2656,7 @@ "Synchronisierten Verzeichniswechsel deaktivieren und das Verzeichnis auf dem " "Server wechseln?" -#: ../../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 " @@ -2657,7 +2667,7 @@ "nicht bestimmen.\n" "Synchronisierter Verzeichniswechsel wurde deaktiviert." -#: ../../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 " @@ -2669,14 +2679,14 @@ "Synchronisierter Verzeichniswechsel wurde deaktiviert." #: ../../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 "Konnte Zwischenablage nicht öffnen" -#: ../../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 "Konnte Logdatei nicht öffnen: %s" @@ -2689,42 +2699,50 @@ msgid "Could not parse server address:" msgstr "Konnte Serveradresse nicht verarbeiten:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Konnte vom Datensocket nicht lesen." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Konnte vom Socket nicht lesen: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Konnte Servereintrag nicht lesen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Es konnte nicht zum Dateiende gesprungen werden" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Konnte Befehl nicht an fzputtygen senden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "IO-Thread konnte nicht gestartet werden" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Proxy-Handshake konnte nicht gestartet werden: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Übertragung konnte nicht gestartet werden" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2748,7 +2766,7 @@ "Konnte \"%s\" nicht schreiben; die globalen Lesezeichen konnten nicht " "gespeichert werden: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2758,9 +2776,9 @@ "werden.\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 "" @@ -2772,28 +2790,28 @@ msgid "Could not write \"%s\":" msgstr "Konnte \"%s\" nicht schreiben:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Konnte Schlüsseldatei nicht schreiben: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Konnte nicht in lokale Datei schreiben" -#: ../../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 "Konnte nicht in Logdatei schreiben: %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 "Konnte nicht in Socket schreiben: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Staat:" @@ -2801,11 +2819,11 @@ msgid "Crea&te new file" msgstr "&Neue Datei erstellen" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "&Fehlendes lokales Verzeichnis erstellen und betreten" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "&Fehlendes Serververzeichnis erstellen und betreten" @@ -2836,45 +2854,45 @@ msgid "Create director&y and enter it" msgstr "Verzeichnis erstellen und &betreten" -#: ../../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 "Verzeichnis erstellen" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Leere Datei erstellen" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Erstelle Verzeichnis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Erstelle Verzeichnis '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kritischer Fehler" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kritischer Fehler:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kritischer Dateiübertragungsfehler" -#: ../../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 "Kritischer Dateiübertragungsfehler nach Übertragung von %s in %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" @@ -2905,7 +2923,7 @@ msgid "Cus&tom" msgstr "&Benutzerdefiniert" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Eigener Filtersatz" @@ -2932,6 +2950,10 @@ msgid "D&elete" msgstr "Lösch&en" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "&Verzeichnisvergleich" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Alle &deaktivieren" @@ -2945,7 +2967,7 @@ msgstr "D&oppelklick-Aktion für Verzeichnisse:" #: ../../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 "&Kopieren" @@ -2961,8 +2983,8 @@ msgid "Data" msgstr "Daten" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Datensocket wurde zu früh geschlossen." @@ -3084,21 +3106,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Lösche %u Dateien aus \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Verzeichnisse löschen" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"Das Löschen von mehreren, nicht zusammengehörenden Verzeichnissen, wird noch " -"nicht unterstützt" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Symbolische Verknüpfung löschen" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Desktop" @@ -3120,7 +3132,7 @@ msgid "Dire&ctories" msgstr "Verzei&chnisse" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Richtung" @@ -3128,13 +3140,13 @@ msgid "Directory" msgstr "Verzeichnis" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Verzeichnisvergleich" @@ -3148,11 +3160,11 @@ "Das Verzeichnis, das die Logdatei enthält, existiert nicht oder der " "Dateiname ist ungültig." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Anzeigen des Verzeichnisinhalts durch Benutzer abgebrochen" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Anzeigen des Verzeichnisinhalts fehlgeschlagen" @@ -3160,12 +3172,12 @@ msgid "Directory listing filters" msgstr "Datei-/Verzeichnisfilter" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Anzeigen des Verzeichnisinhalts für \"%s\" abgeschlossen" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Anzeigen des Verzeichnisinhalts abgeschlossen" @@ -3173,14 +3185,14 @@ msgid "Disa&ble all" msgstr "Alle d&eaktivieren" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Synchronisierten Verzeichniswechsel deaktivieren und das Serververzeichnis " "wechseln?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3192,23 +3204,23 @@ msgid "Disconnect from server" msgstr "Verbindung zum Server trennen" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Verbindung zum Server getrennt" -#: ../../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 "Verbindung zum Server getrennt: %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 "Trenne Verbindung zu vorherigem Server" @@ -3234,8 +3246,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Wollen Sie FileZilla wirklich beenden?" @@ -3258,7 +3270,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Wollen Sie wirklich die Übertragungs-Warteschlange löschen?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Wollen Sie wirklich '%s' zum Server senden?" @@ -3267,7 +3279,7 @@ msgid "Do you want to reopen this file?" msgstr "Wollen Sie diese Datei erneut öffnen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentation" @@ -3289,7 +3301,7 @@ msgid "Download" msgstr "Herunterladen" -#: ../../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 "Begrenzung der Do&wnloadgeschwindigkeit:" @@ -3303,9 +3315,9 @@ msgid "Download limit: none" msgstr "Download-Begrenzung: keine" -#: ../../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 "Suchergebnisse herunterladen" @@ -3317,7 +3329,7 @@ msgid "Download selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse herunterladen" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3330,28 +3342,18 @@ msgid "Downloading" msgstr "Wird heruntergeladen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Lade %s herunter" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Das Herunterladen von mehreren, nicht zusammengehörenden Verzeichnissen, " -"wird noch nicht unterstützt" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Suchergebnisse herunterladen" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Lade Update herunter..." -#: ../../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 "" @@ -3361,9 +3363,9 @@ "Drag&Drop zwischen verschiedenen Instanzen von FileZilla ist derzeit noch " "nicht möglich." -#: ../../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." @@ -3397,7 +3399,7 @@ msgid "E&xport..." msgstr "&Export..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-Mail:" @@ -3415,16 +3417,16 @@ msgstr "" "Datei mit dem eingestellten Editor bearbeiten und auf den Server hochladen." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Bearbeiten von Verzeichnissen wird nicht unterstützt" -#: ../../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 "Bearbeiten fehlgeschlagen" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Bearbeiten von Suchergebnissen" @@ -3432,7 +3434,7 @@ msgid "Email:" msgstr "E-Mail:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Leerer Befehl" @@ -3440,7 +3442,7 @@ msgid "Empty command." msgstr "Leerer Befehl." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Leeres Verzeichnis" @@ -3486,7 +3488,7 @@ msgid "Encryption details" msgstr "Verschlüsselungsdetails" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Vergleichen beenden und Sortierreihenfolge ändern?" @@ -3494,15 +3496,15 @@ msgid "Enter &custom command..." msgstr "&Benutzerdefinierten Befehl eingeben..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Geben Sie 0 für unbegrenzte Geschwindigkeit ein." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Befehl eingeben" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Benutzerdefinierten Befehl eingeben" @@ -3516,11 +3518,11 @@ msgid "Enter filter name" msgstr "Bitte einen Filternamen angeben" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Bitte einen Namen für den Filtersatz eingeben" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Neuen Namen für den Filtersatz eingeben" @@ -3562,7 +3564,7 @@ "- ftps:// für FTP über TLS (implizit)\n" "- ftpes:// für FTP über TLS (explizit)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3592,7 +3594,7 @@ msgid "Error importing" msgstr "Fehler beim Importieren" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Fehler beim Laden der Warteschlange" @@ -3601,50 +3603,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/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: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:939 msgid "Error loading xml file" msgstr "xml-Datei kann nicht geladen werden" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Fehler beim Speichern der Warteschlange" -#: ../../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 "Fehler beim Starten des Programms" #: ../../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: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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "xml-Datei kann nicht geschrieben werden" -#: ../../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 "Fehler:" @@ -3736,24 +3738,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP über implizites 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/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 "Verzeichnis konnte nicht gewechselt werden" -#: ../../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 "Wechseln der Sprache fehlgeschlagen" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Kopieren oder Verschieben der Servereinträge fehlgeschlagen" @@ -3761,121 +3763,125 @@ msgid "Failed to create backup copy of xml file" msgstr "Sicherheitskopie der xml-Datei konnte nicht erstellt werden" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../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/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Pfad für 'Eigene Dateien' konnte nicht gefunden werden" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Desktop-Pfad konnte nicht gefunden werden" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "FTP-Engine konnte nicht initialisiert werden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "TLS konnte nicht initialisiert werden." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Netzwerkfunktionalität konnte nicht initialisiert werden" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" "Panels konnten nicht aus den Ressourcendateien geladen werden. Kann es sein, " "dass die Ressourcendateien ungültig sind?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Laden des privaten Schlüssels fehlgeschlagen: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, 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:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "%s konnte nicht zum Lesen geöffnet werden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "%s konnte nicht zum Schreiben geöffnet werden" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Zurückgegebener Pfad konnte nicht geparst werden." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Daten konnten nicht empfangen werden" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Verzeichnisinhalt konnte nicht empfangen werden" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../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/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "" "Externe IP-Adresse konnte nicht ermittelt werden. Verwende statt dessen " "lokale IP-Adresse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../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:706 +#: ../../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/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Externe IP-Adresse konnte nicht ermittelt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Fehler beim Senden des Befehls." -#: ../../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 "" "Die Sprache konnte nicht in %s (%s) geändert werden. Die Standard-" "Systemsprache wird benutzt." -#: ../../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)." @@ -3883,14 +3889,14 @@ "Die Sprache konnte nicht in %s (%s) geändert werden, die Standard-" "Systemsprache (%s, %s) wird benutzt." -#: ../../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 "" "Die Sprache konnte nicht in %s (%s) geändert werden. Die Standard-" "Systemsprache wird benutzt." -#: ../../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" @@ -3898,14 +3904,14 @@ "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache " "wird benutzt." -#: ../../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 "" "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache " "(%s, %s) wird benutzt." -#: ../../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 "" @@ -3916,11 +3922,11 @@ msgid "Failed to validate settings" msgstr "Überprüfung der Einstellungen fehlgeschlagen" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Verifizierung des Zertifikats der Gegenstelle fehlgeschlagen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Fehler beim Schreiben in die Datei %s" @@ -3953,7 +3959,7 @@ msgid "File Types" msgstr "Dateitypen" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "File descriptor kein Socket" @@ -3965,7 +3971,7 @@ msgid "File editing" msgstr "Bearbeiten von Dateien" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Datei existiert" @@ -3982,8 +3988,8 @@ msgstr "Dateilisten" #: ../../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 "Datei nicht gefunden" @@ -3992,39 +3998,39 @@ msgid "File search" msgstr "Dateisuche" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Dateiübertragung durch Benutzer abgebrochen" -#: ../../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 "" "Dateiübertragung durch Benutzer abgebrochen nach Übertragung von %s in %s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Dateiübertragung fehlgeschlagen" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Dateiübertragung übersprungen" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Dateiübertragung erfolgreich" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Dateiübertragung erfolgreich, %s in %s übertragen" -#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Dateiübertragungen dauern noch an." @@ -4036,7 +4042,7 @@ msgid "File would transfer with binary data type." msgstr "Datei würde mit Datentyp 'Binär' übertragen werden." -#: ../../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" @@ -4050,11 +4056,11 @@ "FileZilla kann nun Ihre Konfiguration testen, um sicherzustellen, dass alles " "ordnungsgemäß eingestellt ist." -#: ../../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 ist schon mit einem Server verbunden." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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 " @@ -4070,7 +4076,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 @@ -4081,14 +4087,14 @@ msgid "Filename &filters..." msgstr "&Datei-/Verzeichnisfilter..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "" "Dateiname kann für Verzeichnis %s und Dateiname %s nicht erstellt werden" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Dateiname ungültig" @@ -4117,7 +4123,7 @@ msgstr "Momentan bearbeitete Dateien" #: ../../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" @@ -4127,7 +4133,7 @@ msgid "Filesize format" msgstr "Dateigrößenformat" -#: ../../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" @@ -4165,8 +4171,8 @@ msgid "Filter out items matching none of the following" msgstr "Objekte ausfiltern, die keine der Folgenden erfüllen" -#: ../../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 "Filtersatz existiert bereits" @@ -4180,11 +4186,11 @@ msgid "Filter validation failed" msgstr "Filter-Gültigkeitsprüfung fehlgeschlagen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "&Dateien suchen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "&Verzeichnisse suchen" @@ -4201,7 +4207,7 @@ msgid "Fingerprint:" msgstr "Fingerabdruck:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Assistent zur Firewall- und Routerkonfiguration" @@ -4235,7 +4241,7 @@ msgid "Force showing &hidden files" msgstr "A&uflistung versteckter Dateien erzwingen" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Auflistung versteckter Dateien erzwingen" @@ -4250,12 +4256,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Neues %s %s gefunden\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Weitere Dokumentation" @@ -4263,7 +4269,7 @@ msgid "General" msgstr "Allgemein" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Allgemeines Versagen des SOCKS-Servers" @@ -4276,12 +4282,12 @@ msgid "Get external IP address from the following URL:" msgstr "Externe IP-Adresse von folgender URL beziehen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Hilfe erhalten" -#: ../../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 "" "Ein Filtersatz mit diesem Namen existiert bereits, Filtersatz überschreiben?" @@ -4290,22 +4296,22 @@ msgid "Global bookmarks" msgstr "Globale Lesezeichen" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-Fehler %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-Fehler %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-Fehler %d in %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-Fehler %d: %s" @@ -4335,17 +4341,17 @@ msgstr "Versteckt" #: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Hoch" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Höchste" -#: ../../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 "" "Der größte verfügbare Port muss eine Zahl zwischen 1024 und 65535 sein." @@ -4361,7 +4367,7 @@ msgid "Homepage:" msgstr "Homepage:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Server ist offline" @@ -4378,7 +4384,7 @@ msgstr "" "Host fängt mit '[' an, es wurde aber keine schließende Klammer gefunden." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Host nicht erreichbar" @@ -4397,7 +4403,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "ISO 8&601 (Beispiel: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-Adressen werden mit SOCKS4-Proxy nicht unterstützt" @@ -4447,7 +4453,7 @@ "Falls Sie nichts von einem Wechsel des Server-Schlüssels wissen, " "kontaktieren Sie bitte den Server-Administrator." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4455,7 +4461,7 @@ "Wenn das Problem weiterhin besteht, wird FileZilla durch einen Router oder " "eine Firewall blockiert." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4473,7 +4479,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: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." @@ -4481,7 +4487,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4489,7 +4495,7 @@ "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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Wenn das Problem weiterhin besteht, wenden Sie sich bitte an den Hersteller " @@ -4529,7 +4535,7 @@ "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:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Wenn Sie FileZilla schließen, werden Ihre Änderungen verloren gehen." @@ -4553,7 +4559,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:584 +#: ../../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 " @@ -4589,7 +4595,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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4652,7 +4658,7 @@ "FileZilla den Server nach einem Port und verbindet sich zu diesem Port; " "hierfür muss nicht viel eingerichtet werden." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4660,7 +4666,7 @@ "Unvollständige Kette; oberstes Zertifikat ist kein selbst-unterzeichnetes " "Zertifikat einer Zertifizierungsstelle" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Falsches Passwort" @@ -4672,17 +4678,21 @@ "Informationen zur aktuellen FileZilla-Version konnten nicht abgefragt " "werden. Bitte versuchen Sie es später noch einmal." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Initialisiere TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Unsicherer Algorithmus!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4690,29 +4700,29 @@ msgid "Interface" msgstr "Oberfläche" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Unterbrochen durch Signal" -#: ../../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 "Unterbrochen durch Benutzer" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Content-Length ungültig" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Ungültige HTTP-Rückmeldung" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Ungültiges Argument übergeben" -#: ../../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." @@ -4720,18 +4730,19 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Ungültige Datenpaketgröße." -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Ungültige Daten empfangen" -#: ../../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 "Ungültiges Datum" @@ -4771,38 +4782,38 @@ "ftps:// für FTP über TLS (implizit) und\n" "ftpes:// für FTP über TLS (explizit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Ungültiger regulärer Ausdruck in Suchbedingungen." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Ungültiger Antwortcode" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Ungültige Suchbedingungen: %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 "Ungültiger Pfad für Servereintrag" @@ -4814,23 +4825,23 @@ msgid "Invalid username given." msgstr "Ungültiger Benutzername angegeben." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Ungültiger Wert für 'ai_flags'" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Ungültiger Wert für 'hints'" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Staat des Gerichtsstands:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Ort des Gerichtsstands:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Land oder Provinz des Gerichtsstands:" @@ -4838,7 +4849,7 @@ msgid "Keep directories on top" msgstr "Verzeichnisse immer oben" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4873,11 +4884,11 @@ msgid "Language" msgstr "Sprache" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Sprache gewechselt" -#: ../../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" @@ -4907,7 +4918,7 @@ msgid "Limit:" msgstr "Limit:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Maximale Zeilenlänge überschritten" @@ -4915,13 +4926,14 @@ msgid "Linked against" msgstr "Gelinkt gegen" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Socket für eingehende Verbindungen geschlossen" -#: ../../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 "Auflistung:" @@ -4934,11 +4946,11 @@ msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Lokale Adresse in Benutzung" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Lokaler Endpunkt wurde geschlossen" @@ -4946,21 +4958,21 @@ msgid "Local file" msgstr "Lokale Datei" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Lokale Datei existiert nicht." -#: ../../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 "Lokale Datei ist %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 "Lokale Datei ist ein Verzeichnis anstatt einer regulären Datei." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Lokale Datei ist kein gültiger Dateiname." @@ -4972,7 +4984,7 @@ msgid "Local site:" msgstr "Lokal:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Ort:" @@ -4980,12 +4992,16 @@ msgid "Log file" msgstr "Logdatei" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Angemeldet" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Logging" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4994,7 +5010,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:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5002,7 +5018,7 @@ "Anmeldedaten enthalten nicht-ASCII-konforme Zeichen und der Server " "unterstützt möglicherweise kein UTF-8. Versuche lokalen Zeichensatz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Anmeldevorgang vollständig ausgeführt, jedoch nicht angemeldet. Abbruch." @@ -5022,17 +5038,17 @@ "Kontozugangstyp; kann nur in Verbindung mit einer FTP-URL verwendet werden. " "Argument muss entweder '%s' oder '%s' sein." -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Niedrig" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Niedrigste" -#: ../../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 "Der niedrigste verfügbare Port muss zwischen 1024 und 65535 liegen." @@ -5046,44 +5062,44 @@ "Stellen Sie sicher, dass auf die Datei zugegriffen werden kann und dass sie " "ein wohlgeformtes XML-Dokument ist." -#: ../../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 "Falsches Datenpaketformat: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Falscher Header: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Manuelle Übertragung" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Jede der folgenden Bedingungen muss zutreffen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Mindestens eine der folgenden Bedingungen muss zutreffen" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Keine der folgenden Bedingungen darf zutreffen" @@ -5091,12 +5107,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Maximale Anzahl gleichzeitiger Über&tragungen:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Speicherzuweisungsfehlschlag" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Nachrichtenprotokoll" @@ -5104,7 +5120,7 @@ msgid "Message log position" msgstr "Position des Nachrichtenprotokolls" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Nachricht zu groß" @@ -5124,15 +5140,15 @@ msgid "Move &up" msgstr "Nach &oben" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Arbeitsplatz" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Eigene Dateien" -#: ../../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" @@ -5153,7 +5169,7 @@ msgstr "Name existiert bereits" #: ../../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 "Lesezeichenname existiert bereits." @@ -5169,7 +5185,7 @@ msgid "Need to enter filter name" msgstr "Filtername muss angegeben werden" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Es muss ein gültiger Server-Pfad eingegeben werden" @@ -5177,11 +5193,11 @@ msgid "Need to specify a character encoding" msgstr "Sie müssen einen Zeichensatz angeben" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Weder 'nodename' noch 'servname' angegeben, oder nicht bekannt" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5189,8 +5205,8 @@ "Netzwerkhost besitzt in der angeforderten Adressfamilie keine " "Netzwerkadressen" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Netzwerk nicht erreichbar" @@ -5206,7 +5222,7 @@ msgid "New &tab" msgstr "Neuer &Tab" -#: ../../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 "Neue&s Lesezeichen" @@ -5225,14 +5241,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 "Neues Lesezeichen" -#: ../../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 "Neues Verzeichnis" @@ -5249,9 +5265,9 @@ msgid "New folder" msgstr "Neues Verzeichnis" -#: ../../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 "Neuer Server" @@ -5259,11 +5275,11 @@ msgid "Next to the transfer queue" msgstr "Neben der Übertragungs-Warteschlange" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Nein" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Keine Adresse mit Knotenname verknüpft" @@ -5271,11 +5287,11 @@ msgid "No category to export selected" msgstr "Keine Kategorie zum Exportieren ausgewählt" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Kein Befehl angegeben, Abbruch." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Keine externe IP-Adresse angegeben, versuche Standard-Adresse." @@ -5297,27 +5313,27 @@ msgid "No images available" msgstr "Keine Bilder verfügbar" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../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: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 "Bitte einen Namen für den Filtersatz angeben." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Keine Programmzuordnung für Dateityp" -#: ../../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 "" "Für das Bearbeiten von Dateien mit der Erweiterung '%s' wurde kein Programm " "festgelegt." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Keine Route zum Host" @@ -5325,11 +5341,11 @@ msgid "No search results" msgstr "Keine Suchergebnisse" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Keine Server verfügbar" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Keine unterstützte SOCKS5-Authentifizierungsmethode" @@ -5339,7 +5355,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 "Keine" @@ -5347,18 +5363,18 @@ msgid "None selected yet" msgstr "Noch keiner ausgewählt" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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" @@ -5370,16 +5386,16 @@ "Nicht alle Objekte konnten für die Übertragung wieder zur Warteschlange " "hinzugefügt werden." -#: ../../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 "Nicht verbunden" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Derzeit mit keinem Server verbunden" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Derzeit mit keinem Server verbunden." @@ -5387,11 +5403,11 @@ msgid "Not connected." msgstr "Nicht verbunden." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Nicht initialisiert; WSAStartup muss aufgerufen werden" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Beachten Sie, dass dieses Feature nur bei Verwendung des FTP-Protokolls " @@ -5437,13 +5453,13 @@ #: ../../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" @@ -5462,7 +5478,7 @@ "Übertragungsmodus und (falls aktiviert) den alternativen Übertragungsmodus " "im Fehlerfall festgelegt." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Einmal" @@ -5508,8 +5524,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 "Öffnen fehlgeschlagen" @@ -5532,19 +5548,19 @@ msgid "Operating System:" msgstr "Betriebssystem:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Operation wird bereits ausgeführt" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Operation wird ausgeführt" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Operation nicht unterstützt" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisation:" @@ -5552,16 +5568,16 @@ msgid "Other SFTP options" msgstr "Sonstige SFTP-Optionen" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Anderer Systemfehler" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Andere:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Speichermangel" @@ -5610,7 +5626,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Überschr&eiben falls Größe unterschiedlich oder Quelldatei aktueller" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Eigener Build-Typ: %s\n" @@ -5637,7 +5653,7 @@ msgid "P&roxy host:" msgstr "P&roxy-Server:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT-Befehl wurde vom Router oder der Firewall beeinträchtigt." @@ -5645,11 +5661,11 @@ msgid "Pa&ssive (recommended)" msgstr "&Passiv (empfohlen)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parameter keine gültige URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Parse %d Bytes der Versionsinformationen.\n" @@ -5669,13 +5685,13 @@ msgid "Passive mode" msgstr "Passiver Modus" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "Der passive Modus ist nun der Standard-Übertragungsmodus." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Passwort benötigt" @@ -5684,14 +5700,14 @@ msgid "Path" msgstr "Pfad" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "" "Pfad kann für Verzeichnis %s und Unterverzeichnis %s nicht erstellt werden" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Pfad nicht gefunden:" @@ -5711,8 +5727,8 @@ msgid "Permission" msgstr "Berechtigung" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -5725,7 +5741,7 @@ msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5741,13 +5757,13 @@ "Bitte konfigurieren Sie Ihre Router und Firewalls so, dass FileZilla " "ausgehende Verbindungen zu beliebigen Ports aufbauen kann." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5786,7 +5802,7 @@ 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:389 +#: ../../locales/../src/interface/filter.cpp:390 #, 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" @@ -5822,7 +5838,7 @@ msgid "Please enter a password for this server:" msgstr "Bitte geben Sie ein Passwort für diesen Server ein:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5840,7 +5856,7 @@ "Bitte geben Sie ein Timeout zwischen 10 und 9999 Sekunden an, oder 0, um " "Timeouts zu deaktivieren." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Bitte geben Sie einen eindeutigen Namen für diesen Filtersatz an." @@ -5848,11 +5864,11 @@ msgid "Please enter a username for this server:" msgstr "Bitte geben Sie einen Benutzernamen für diesen Server ein:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Bitte geben Sie einen gültigen Port-Bereich an." -#: ../../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 "" "Bitte geben Sie die URL an, von der Ihre externe Adresse bezogen werden soll" @@ -5865,7 +5881,7 @@ "Bitte tragen Sie für die Begrenzung der Uploadgeschwindigkeit einen Wert " "größer oder gleich 0 %s/s ein." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5873,14 +5889,14 @@ "Bitte geben Sie einen FTP-Befehl ein.\n" "Die Benutzung eigener FTP-Befehle leert den Verzeichniscache." -#: ../../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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Bitte geben Sie den Namen der zu erstellenden Datei ein:" @@ -5889,12 +5905,12 @@ msgstr "" "Bitte geben Sie einen Benutzernamen und ein Passwort für diesen Server ein:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Bitte geben Sie Ihre externe IP-Adresse ein" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5913,7 +5929,7 @@ "Bitte folgen Sie den Anweisungen sorgfältig, da eine falsche Konfiguration " "erfolgreiche FTP-Verbindungen verhindert." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5922,13 +5938,13 @@ "Verbindungen aufzubauen und die Adresse des Adressauflösers korrekt " "eingegeben ist." -#: ../../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 "" "Bitte vergewissern Sie sich, dass die gewünschte Sprache auf dem System " "installiert ist." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5953,7 +5969,7 @@ "Software benutzt wird. Sollte dies einen Fehlalarm auslösen, können Sie " "diesen ohne weiteres ignorieren." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5970,7 +5986,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:585 +#: ../../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 " @@ -5980,7 +5996,7 @@ "funktionierenden Servern auf Probleme stoßen, führen Sie bitte diesen " "Assistenten erneut aus." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Bitte wählen Sie eine Aktion aus:" @@ -6020,7 +6036,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:596 +#: ../../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. " @@ -6039,8 +6055,8 @@ msgid "Positio&n of the message log:" msgstr "&Position des Nachrichtenprotokolls:" -#: ../../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 "Postleitzahl:" @@ -6052,12 +6068,12 @@ msgid "Preallocation" msgstr "Speicherplatzvorbelegung" -#: ../../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 "Vordefinierte Server" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Änderungszeitpunkt der Dateien beibehalten" @@ -6065,7 +6081,7 @@ msgid "Preview:" msgstr "Vorschau:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "" "Das Zertifikat der Datenverbindung stimmt nicht mit dem der Hauptverbindung " @@ -6083,7 +6099,7 @@ msgid "Prioritize directories (default)" msgstr "Bevorzuge Verzeichnisse (Standard)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Priorität" @@ -6113,7 +6129,7 @@ msgid "Process &Queue" msgstr "&Warteschlange abarbeiten" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Überlauf der Prozess-Dateitabelle" @@ -6123,11 +6139,11 @@ msgid "Processed %s in %s." msgstr "%s in %s verarbeitet." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protokoll nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokoll auf angegebenem Socket-Typ nicht unterstützt" @@ -6144,39 +6160,43 @@ msgid "Proxy &user:" msgstr "Proxy-Ben&utzer:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Proxy-Authentifizierung fehlgeschlagen." -#: ../../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-Handshake fehlgeschlagen: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Proxy-Antwort: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Proxy-Anfrage fehlgeschlagen. Antwort des Proxys: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Proxy-Anfrage fehlgeschlagen: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Proxy-Anfrage fehlgeschlagen: Unbekannter Adresstyp in 'CONNECT'-Antwort" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy wurde eingestellt, aber der Proxyserver oder -port ist ungültig" @@ -6192,7 +6212,7 @@ msgid "Public permissions" msgstr "Öffentliche Berechtigungen" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Warteschlange wurde komplett abgearbeitet" @@ -6211,11 +6231,11 @@ msgid "Queue: empty" msgstr "Warteschlange: leer" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Zu übertragende Dateien" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Warteschlange:" @@ -6233,7 +6253,7 @@ msgstr "" "A&usgewählte Dateien zurücksetzen und wieder zur Warteschlange hinzufügen" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Raw-FTP-Befehl" @@ -6250,7 +6270,7 @@ msgid "Re&name" msgstr "U&mbenennen" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6266,12 +6286,12 @@ msgid "Read-only" msgstr "Schreibgeschützt" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Aktuelle Operation wirklich abbrechen?" -#: ../../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 "" @@ -6279,37 +6299,37 @@ 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: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] "Wirklich %d Datei vom Server löschen?" msgstr[1] "Wirklich %d Dateien vom Server löschen?" -#: ../../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 "Wirklich %s und %s vom Server löschen?" -#: ../../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 "" "Möchten Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse vom " "Server löschen?" -#: ../../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 "" "Möchten Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse von " "Ihrem Rechner löschen?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Grund" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Jetzt neustarten" @@ -6317,36 +6337,36 @@ msgid "Rec&urse into subdirectories" msgstr "&Unterverzeichnisse einbeziehen" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "TLS-Warnung vom Server erhalten: %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 "Verzeichnisinhalt empfangen, der EBCDIC-codiert zu sein scheint." -#: ../../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 "Zeile mit einer Länge größer als 10000 Zeichen empfangen, Abbruch." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Empfangene Daten fehlerhaft" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Ungültiges Zeichen in Versionsinformationen empfangen" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Unbekannte TLS-Warnung %d vom Server erhalten" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Empfangene Versionsinformationen sind zu groß" @@ -6380,13 +6400,13 @@ msgid "Recursively deleting files and directories." msgstr "Lösche rekursiv Dateien und Verzeichnisse." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Umleitung zu ungültiger oder nicht unterstützter Adresse: %s" @@ -6396,7 +6416,7 @@ msgid "Refresh the file and folder lists" msgstr "Datei- und Verzeichnislisten aktualisieren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Passwörter speichern?" @@ -6404,20 +6424,20 @@ msgid "Remote" msgstr "Server" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 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:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Datei auf Server" -#: ../../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 "Dateisuche auf Server" @@ -6458,11 +6478,11 @@ "Server-Pfad kann nicht verarbeitet werden. Stellen Sie sicher, dass er ein " "gültiger absoluter Pfad ist." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Server-Pfad konnte nicht geparst werden." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Verarbeiten des Server-Pfads:" @@ -6502,30 +6522,30 @@ msgid "Rename selected files and directories" msgstr "Ausgewählte Dateien und Verzeichnisse umbenennen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "'%s' wird in '%s' umbenannt" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Fehler und Verbesserungswünsche mitteilen" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Anfrage zurückgewiesen oder fehlgeschlagen" @@ -6541,28 +6561,28 @@ msgid "Reset and requeue &all" msgstr "Alle &Dateien zurücksetzen und wieder zur Warteschlange hinzufügen" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Aufgelöstes Protokoll ist unbekannt" -#: ../../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 "Auflösen der IP-Adresse für %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Ressource vorübergehend nicht verfügbar" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Antwort:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Ergebnisse:" @@ -6581,19 +6601,19 @@ "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:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Empfange Verzeichnisinhalt für \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Empfange Verzeichnisinhalt..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Beziehe externe IP-Adresse von %s" @@ -6610,7 +6630,7 @@ msgid "S&hutdown system" msgstr "S&ystem herunterfahren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "S&top" @@ -6630,7 +6650,7 @@ msgid "SOC&KS 4" msgstr "SO&CKS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-Proxy wird Verbindung herstellen mit: %s" @@ -6639,35 +6659,35 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Einstellungen speichern?" -#: ../../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 "" "Das Speichern von Passwörtern wurde von Ihrem Systemadministrator " "deaktiviert." -#: ../../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 "Das Speichern von Passwörtern wurde von Ihnen deaktiviert." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../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:1712 +#: ../../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/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Such&bedingungen:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "&Zu durchsuchendes Verzeichnis:" @@ -6683,8 +6703,8 @@ msgid "Security information" msgstr "Sicherheitsinformationen" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Siehe auch: https://wiki.filezilla-project.org/Network_Configuration" @@ -6737,7 +6757,7 @@ msgstr "Wählen Sie die Datei für die exportierten Daten" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Wählen Sie die Datei für die exportierte Warteschlange" @@ -6746,7 +6766,7 @@ msgstr "Wählen Sie die Datei für die exportierten Einstellungen" #: ../../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 "Wählen Sie die Datei für die exportierten Server" @@ -6755,23 +6775,23 @@ msgstr "" "Wählen Sie die Datei, von der die Einstellungen importiert werden sollen." -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Hochzuladende Datei auswählen" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Dateinamen für die konvertierte Schlüsseldatei auswählen" -#: ../../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 "Geben Sie an, wie diese Dateien geöffnet werden sollen." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Zielverzeichnis für Download auswählen" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Zieldateiname auswählen" @@ -6783,7 +6803,7 @@ 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: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." @@ -6797,7 +6817,7 @@ msgstr[0] "%d Verzeichnis ausgewählt." msgstr[1] "%d Verzeichnisse ausgewählt." -#: ../../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." @@ -6818,7 +6838,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s und %s für Übertragung ausgewählt." @@ -6856,7 +6876,7 @@ msgid "Selected file is still being edited" msgstr "Gewählte Datei wird immer noch bearbeitet" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Der ausgewählte Filter funktioniert nur bei lokalen Dateien." @@ -6885,12 +6905,12 @@ "Benutzerdefinierten Befehl, der sonst nicht verfügbar wäre, an den Server " "schicken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Sende Verbindungserhaltungs-Befehl" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Seriennummer:" @@ -6898,23 +6918,23 @@ msgid "Server &Type:" msgstr "Server&typ:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Server hat die TLS-Verbindung nicht ordnungsgemäß geschlossen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Der Server unterstützt keine Nicht-ASCII-Zeichen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6923,19 +6943,19 @@ "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:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 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:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 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:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6945,7 +6965,7 @@ "Dateigrößen bis %d GB. Die Übertragung wird beendet, da die Dateigrößen " "übereinstimmen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6953,11 +6973,11 @@ "Der Server benötigt möglicherweise ein Konto. Bitte geben Sie ein Konto im " "Servermanager an." -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Server gab leeren Pfad zurück." -#: ../../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." @@ -6965,13 +6985,13 @@ "Server sendete eine zusätzliche Login-Aufforderung. Sie müssen den Login-Typ " "'interaktiv' verwenden." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6980,14 +7000,14 @@ "Benutze stattdessen die Serveradresse." #: ../../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: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 "Server sendete unerwartete Antwort." @@ -7003,7 +7023,7 @@ msgid "Server&type:" msgstr "Server&typ:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Server/Lokale Datei" @@ -7020,13 +7040,13 @@ msgid "Set &Priority" msgstr "&Priorität setzen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Berechtigungen für '%s' werden auf '%s' gesetzt" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize ohne Socket aufgerufen" @@ -7046,7 +7066,7 @@ msgid "Show &welcome dialog..." msgstr "&Begrüßungsdialog anzeigen..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Beide Verzeichnisbäume anzeigen und Vergleich fortsetzen?" @@ -7066,7 +7086,7 @@ msgid "Shows this help dialog" msgstr "Zeigt diesen Hilfe-Dialog an" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Jetzt herunterfahren" @@ -7106,23 +7126,23 @@ msgid "Site Manager already open" msgstr "Servermanager bereits geöffnet" -#: ../../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 "Servereintrag existiert nicht." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 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: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 "Serverpfad ist ungültig." @@ -7141,7 +7161,7 @@ "gespeichert ist.\n" "Die aktuelle Verbindung in den Servermanager aufnehmen?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Größe" @@ -7160,43 +7180,43 @@ msgid "Skip file" msgstr "Datei überspringen" -#: ../../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 "Überspringe Download von %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 "Überspringe Upload von %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Socketadresse außerhalb des Adressraums" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket bereits verbunden" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Socket wurde geschlossen" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket nicht verbunden" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Sockettyp für Adressfamilie nicht unterstützt" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Einige Dateien werden immer noch bearbeitet oder müssen hochgeladen werden." @@ -7214,7 +7234,7 @@ msgid "Sort directories inline" msgstr "Verzeichnisse einsortieren" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "Die Sortierreihenfolge kann nicht geändert werden, wenn die Verzeichnisse " @@ -7232,7 +7252,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Quell- und Zieldateiname dürfen nicht identisch sein" @@ -7244,7 +7264,7 @@ msgid "Source file:" msgstr "Quelldatei:" -#: ../../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" @@ -7285,19 +7305,19 @@ msgid "Start with opened Site Manager" msgstr "Mit geöffnetem Servermanager starten" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Update-Prüfung gestartet um %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Starte Download von %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Starte Upload von %s" @@ -7306,18 +7326,18 @@ msgid "Starts the local site in the given path" msgstr "Legt den Startpfad für die lokale Ansicht fest" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Land oder Provinz:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7329,7 +7349,7 @@ msgid "Stop recursive operation" msgstr "Rekursive Operation anhalten" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Straße:" @@ -7345,11 +7365,11 @@ msgid "Summary of test results:" msgstr "Zusammenfassung der Testergebnisse:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Jetzt in Standby-Modus gehen" -#: ../../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." @@ -7357,24 +7377,24 @@ "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: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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Synchronisierter Verzeichniswechsel" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synchronisierter Verzeichniswechsel wurde deaktiviert." @@ -7388,8 +7408,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Syntaxfehler in der Kommandozeile" @@ -7401,11 +7421,11 @@ msgid "System details" msgstr "Systemdetails" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Systembegrenzung offener Dateien überschritten" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Netzwerk-Subsystem des Systems hat versagt" @@ -7413,19 +7433,19 @@ msgid "T&oolbar" msgstr "&Werkzeugleiste" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS-Verbindung hergestellt, schicke HTTP-Anfrage" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-Verbindung hergestellt, warte auf Willkommensnachricht..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS-Verbindung hergestellt." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL abgelaufen" @@ -7437,15 +7457,15 @@ msgid "Target file:" msgstr "Zieldatei:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Zieldateiname existiert bereits!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Zieldateiname existiert bereits - trotzdem fortfahren?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Vorübergehender Fehlschlag bei Namensauflösung" @@ -7453,7 +7473,7 @@ msgid "Test results" msgstr "Testergebnisse" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Überprüfe, ob der Server das Fortsetzen von Downloads unterstützt." @@ -7482,25 +7502,25 @@ "geöffnet.\n" "Bitte schließen Sie ihn oder die Daten können nicht gelöscht werden." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Die eingegebene Adresse lautet: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Der 'ai_family'-Member wird nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Das Lesezeichen konnte nicht hinzugefügt werden." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Die Lesezeichen konnten nicht gelöscht werden." @@ -7528,17 +7548,17 @@ "Das benutzerdefinierte Zeitformat ist ungültig oder enthält nicht " "unterstützte Formatierungszeichen." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/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: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 "Der Standardeditor für Textdateien konnte nicht gefunden werden." -#: ../../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 "Der Standardeditor für Textdateien ist '%s'." @@ -7551,7 +7571,7 @@ "Der angegebene Filtername existiert bereits; wählen Sie bitte einen anderen " "Namen." -#: ../../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 "Die Dateiendung '%s' ist bereits in der Liste vorhanden" @@ -7567,7 +7587,7 @@ "Bitte geben Sie einen neuen Namen ein:" #: ../../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" @@ -7600,7 +7620,7 @@ msgstr "Die Datei '%s' konnte nicht geladen werden." #: ../../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" @@ -7610,7 +7630,7 @@ "Auf Ihrem System ist diesem Dateityp kein Programm zugeordnet." #: ../../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" @@ -7632,7 +7652,7 @@ "Datenverlust führen.\n" "Möchten Sie fortfahren?" -#: ../../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" @@ -7681,7 +7701,7 @@ msgid "The following files are currently being edited:" msgstr "Folgende Dateien werden im Moment bearbeitet:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Die freie, quelloffene FTP-Lösung" @@ -7703,17 +7723,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, 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:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Das lokale Verzeichnis '%s' existiert nicht." -#: ../../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" @@ -7724,7 +7744,7 @@ "Synchronisierten Verzeichniswechsel deaktivieren und das lokale Verzeichnis " "wechseln?" -#: ../../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." @@ -7742,16 +7762,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Die Warteschlange wird nicht gespeichert werden." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Das Serververzeichnis '%s' existiert nicht." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7794,11 +7814,11 @@ "Dies könnte gefährlich sein und Ihr System beschädigen.\n" "Möchten Sie wirklich fortsetzen?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Der Server konnte nicht hinzugefügt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Der Server sendete eine unerwartete oder nicht erkannte Antwort." @@ -7833,7 +7853,7 @@ "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:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Der 'servname'-Parameter wird bei ai_socktype nicht unterstützt" @@ -7845,21 +7865,21 @@ "Die Einstellungen wurden importiert. Sie müssen FileZilla neu starten, damit " "alle Einstellungen wirksam werden." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Die angegebene Adressfamilie wird nicht unterstützt" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Der angegebene Netzwerkname ist nicht länger verfügbar" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Das System wird in Kürze heruntergefahren, sofern Sie nicht auf Abbrechen " @@ -7873,7 +7893,7 @@ "Die Zieldatei existiert bereits.\n" "Bitte wählen Sie eine Aktion aus." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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 " @@ -7889,15 +7909,15 @@ msgid "Themes" msgstr "Designs" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Dieser Filtersatz kann nicht entfernt werden." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Dieser Filtersatz kann nicht umbenannt werden." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7921,7 +7941,7 @@ "Dieser Assistent wird Ihnen dabei helfen, eventuell vorhandende Router und " "Firewalls zu konfigurieren und Ihre Konfiguration zu testen." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Zeitpunkt" @@ -7934,27 +7954,27 @@ msgstr "&Zeitüberschreitung nach" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Zeitüberschreitung" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Um die Verzeichnisse vergleichen zu können, ist es notwendig, dass die " "Dateilisten entsprechend angeordnet sind." -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -8019,17 +8039,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Anzeige der Übertragungs-Warteschlange an-/ausschalten" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Header zu lang" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Zu viele Adressumleitungen" -#: ../../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 "Trace:" @@ -8058,17 +8078,17 @@ msgid "Transfer Settings" msgstr "Übertragungs-Einstellungen" -#: ../../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 "Übertragungsverbindung unterbrochen: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Übertragene Daten waren fehlerhaft." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Wird übertragen" @@ -8077,8 +8097,7 @@ msgid "Transfers" msgstr "Übertragungen" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Übertragungen abgeschlossen" @@ -8090,11 +8109,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "&Folgende Dateitypen als ASCII-Dateien behandeln:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Verändertem Serverschlüssel vertrauen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Neuem Serverschlüssel vertrauen:" @@ -8132,7 +8151,7 @@ msgid "U&pload" msgstr "&Hochladen" -#: ../../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 "Begrenzung der U&ploadgeschwindigkeit:" @@ -8142,20 +8161,20 @@ msgstr "&Verwende Dateitypzuordnungen falls verfügbar" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Stand&ardeinstellung des Systems verwenden" +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 msgid "USER@&HOST" msgstr "&BENUTZER@SERVER" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Nicht zugewiesener Fehlercode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Element:" @@ -8164,12 +8183,12 @@ msgid "Unknown" msgstr "Unbekannt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Unbekannte Version des SOCKS-Protokolls: %d" @@ -8182,7 +8201,7 @@ msgid "Unknown host key" msgstr "Unbekannter Server-Schlüssel" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8198,8 +8217,8 @@ "Unbekanntes Wurzelelement; die Datei scheint nicht von FileZilla erzeugt " "worden zu sein." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8207,7 +8226,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:598 +#: ../../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." @@ -8215,11 +8234,11 @@ "Solange dieses Problem nicht gelöst ist, funktioniert der Aktive Modus " "nicht. Stattdessen muss der Passive Modus verwendet werden." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Nicht unterstützter Zertifikatstyp" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Diese Art der Adressumleitung wird nicht unterstützt" @@ -8289,12 +8308,12 @@ msgid "Use &custom editor:" msgstr "B&enutzerdefinierten Editor verwenden:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "S&ynchronisierten Verzeichniswechsel verwenden" @@ -8322,8 +8341,8 @@ msgstr "Server aus Servermanager verwenden" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Stan&dardeinstellung des Systems verwenden" +msgid "Use system &defaults for current language" +msgstr "Stan&dardeinstellung des Systems für aktuelle Sprache verwenden" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8360,7 +8379,7 @@ msgid "User:" msgstr "Benutzer:" -#: ../../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 "Benutzername kann nicht nur aus Leerzeichen bestehen" @@ -8384,7 +8403,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Ausführliche wxWidgets-Logmeldungen" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Überprüfe Zertifikat..." @@ -8392,7 +8411,7 @@ msgid "Very high" msgstr "Sehr hoch" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "" "Anzeige versteckter Dateien aktiviert, aber vom Server nicht unterstützt" @@ -8409,15 +8428,15 @@ msgid "W&rite" msgstr "S&chreiben" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Warte" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Warten auf Browsing-Verbindung" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Warten auf Passworteingabe" @@ -8429,7 +8448,7 @@ msgid "Waiting to retry..." msgstr "Nächsten Versuch abwarten..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Warnung, eine Datenverbindung von einer falschen IP wird ignoriert." @@ -8452,11 +8471,11 @@ msgid "Warning: Potential security breach!" msgstr "Warnung: Mögliche Sicherheitslücke!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Willkommen bei FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Neuerungen" @@ -8464,7 +8483,7 @@ msgid "What's new:" msgstr "Neuerungen:" -#: ../../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." @@ -8489,7 +8508,7 @@ msgid "Widescreen" msgstr "Breitbild" -#: ../../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 "Soll FileZilla Passwörter speichern?" @@ -8497,20 +8516,20 @@ msgid "Wr&ite" msgstr "Sc&hreiben" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Falsche externe IP-Adresse" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Falsche Zeilenenden" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8522,7 +8541,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Sie verwenden die aktuelle FileZilla-Version." -#: ../../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 "Sie können diesen Dialog auch über das Hilfe-Menü öffnen." @@ -8564,12 +8583,12 @@ "Sie haben keinen neuen Namen für die Datei angegeben. Die Datei stattdessen " "überschreiben?" -#: ../../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 "Sie haben mindestens eine symbolische Verknüpfung ausgewählt." #: ../../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?" @@ -8577,7 +8596,7 @@ "Sie haben mehr als 10 Dateien zum Bearbeiten ausgewählt; möchten Sie " "wirklich fortfahren?" -#: ../../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?" @@ -8585,7 +8604,7 @@ "Sie haben mehr als 10 Dateien oder Verzeichnisse zum Öffnen ausgewählt; " "möchten Sie wirklich fortfahren?" -#: ../../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 "Sie müssen einen Servernamen angeben." @@ -8594,30 +8613,30 @@ msgid "You have to enter a key file path" msgstr "Sie müssen einen Schlüsseldatei-Pfad angeben" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Sie müssen ein lokales Verzeichnis angeben." -#: ../../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 "Sie müssen eine gültige IP-Adresse eingeben." +#: ../../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 "Sie müssen eine gültige IPv4-Adresse eingeben." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Sie müssen ein beschreibbares lokales Verzeichnis angeben." -#: ../../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 "Sie müssen einen Kontonamen angeben." -#: ../../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 "Sie müssen einen Benutzernamen angeben" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8673,23 +8692,23 @@ "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:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Sie müssen eine lokale Datei angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Sie müssen eine Datei auf dem Server angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Sie müssen einen Server-Pfad angeben." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Sie müssen einen Server angeben." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8697,7 +8716,7 @@ "Sie sollten keine Probleme haben, eine Verbindung zu anderen Servern " "herzustellen, Dateiübertragungen sollten richtig funktionieren." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Das System wird in den Standby-Modus versetzt, sofern Sie nicht auf " @@ -8724,7 +8743,7 @@ msgid "contains" msgstr "enthält" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "benutzerdefiniert" @@ -8746,19 +8765,19 @@ msgid "equals" msgstr "ist gleich" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "Datei" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-Sperrdatei" -#: ../../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 " @@ -8768,15 +8787,15 @@ "Bitte stellen Sie sicher, dass sich diese ausführbare Datei im gleichen " "Verzeichnis wie das FileZilla-Hauptprogramm befindet." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp gehört zu einer anderen FileZilla-Version" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp konnte nicht gestartet werden" -#: ../../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 gab keine Zertifikate zurück" @@ -8832,10 +8851,10 @@ msgid "owner writeable" msgstr "'Besitzer: beschreibbar'" -#: ../../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: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 "unbekannt" @@ -8855,3 +8874,6 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" + +#~ msgid "Empty dirs to visit" +#~ msgstr "Leere Verzeichnisse zu besuchen" diff -Nru filezilla-3.14.1/locales/el.po filezilla-3.15.0.2/locales/el.po --- filezilla-3.14.1/locales/el.po 2015-09-04 11:41:18.000000000 +0000 +++ filezilla-3.15.0.2/locales/el.po 2016-02-05 08:54:46.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: FileZilla Client 3.13.1\n" +"Project-Id-Version: FileZilla Client 3.15.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-04 13:26+0200\n" -"PO-Revision-Date: 2015-09-04 13:03+0300\n" +"POT-Creation-Date: 2016-01-23 18:33+0100\n" +"PO-Revision-Date: 2016-01-21 15:21+0200\n" "Last-Translator: Ydatografida \n" "Language-Team: Stamatis H. Stamatellos \n" "Language: el_GR\n" @@ -49,9 +49,9 @@ msgstr[0] "%d φάκελος" msgstr[1] "%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" @@ -60,9 +60,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" @@ -83,12 +83,12 @@ msgstr[0] "%d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s" msgstr[1] "%d αρχεία. Συνολικό μέγεθος: Τουλάχιστον %s" -#: ../../locales/../src/interface/QueueView.cpp:2774 +#: ../../locales/../src/interface/QueueView.cpp:2778 #, 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" @@ -128,7 +128,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Το πιστοποιητικό έλυξε!" @@ -160,7 +160,7 @@ msgstr[0] "%s byte" msgstr[1] "%s bytes" -#: ../../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 " @@ -175,7 +175,7 @@ "Παρακαλώ, κάντε ξανά λήψη του 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 " @@ -191,7 +191,7 @@ "- Σιγουρευτείτε ότι το %s είναι στη λίστα φακέλου της μεταβλητής PATH.\n" "- Ορίστε τη πλήρη διαδρομή για το %s στη μεταβλητή FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s με %d bits" @@ -205,7 +205,7 @@ msgid "%w - Proxy password" msgstr "%w - Κωδικός πρόσβασης διαμεσολαβητή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Διακοπή της προηγούμενης σύνδεσης και συνδέση στην τρέχουσα καρτέλα" @@ -259,7 +259,7 @@ msgid "&Always use default editor" msgstr "&Χρήση πάντα του προκαθορισμένου επεξεργαστή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Πάντα κατόπιν επιλογής για όλα τα μη συσχετιζόμενα αρχεία" @@ -297,9 +297,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 @@ -312,8 +312,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" @@ -386,14 +386,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 "&Διαγραφή" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Διαγραφή συμβολικής σύνδεσης" @@ -401,14 +401,14 @@ msgid "&Directory comparison" msgstr "&Σύγκριση φακέλων" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -437,7 +437,7 @@ msgid "&Display size in bytes" msgstr "&Εμφάνιση του μεγέθους σε bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Να μην απομνημονεύει κωδικούς (συνιστάται)" @@ -458,7 +458,7 @@ msgid "&Download" msgstr "&Λήψη" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Λήψη στο:" @@ -491,7 +491,7 @@ msgid "&Enable compression" msgstr "&Ενεργοποίηση συμπίεσης" -#: ../../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 "&Ενεργοποίηση ορίων ταχύτητας" @@ -508,7 +508,7 @@ msgid "&Enter custom command..." msgstr "&Εισαγωγή προσαρμοσμένης εντολής..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Ε&δραίωση σύνδεσης σε νέα καρτέλα" @@ -561,14 +561,14 @@ msgid "&Finish editing and delete local file" msgstr "&Ολοκλήρωση επεξεργασίας και διαγραφή τοπικού αρχείου" -#: ../../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 "" "&Ισοπέδωση των απομακρυσμένων διαδρομών, λήψη απευθείας στο φάκελο προορισμού" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Η ακόλουθη συμβολική σύνδεση, διαγράφει τα περιεχόμενα του φακέλου " @@ -633,7 +633,7 @@ msgid "&Install new version" msgstr "&Εγκαταστήστε νέα έκδοση" -#: ../../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 "&Διατήρηση δομής της απομακρυσμένης διαδρομής" @@ -658,7 +658,7 @@ msgstr "&Δομή τοπικών φακέλων" #: ../../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 "&Τοπικός φάκελος:" @@ -722,11 +722,11 @@ msgid "&New Site" msgstr "&Νέα τοποθεσία" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Διαθέσιμη νέα έκδοση!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Επόμενο >" @@ -749,7 +749,7 @@ msgstr "&Αριθμητική τιμή:" #: ../../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 "&OK" @@ -827,12 +827,12 @@ msgstr "" "&Απομνημόνευση κωδικού μέχρι το FileZilla να τερματίσει την λειτουργία του" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Απομακρυσμένος φάκελος:" @@ -853,7 +853,7 @@ msgstr "&Διαγραφή επιλεγμένου" #: ../../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 @@ -914,7 +914,7 @@ msgid "&Save as..." msgstr "&Αποθήκευση ως..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Αναζήτηση" @@ -983,7 +983,7 @@ msgid "&Speed limits" msgstr "&Όρια ταχυτήτων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Επείγουσα &έναρξη μεταφοράς" @@ -995,7 +995,7 @@ msgid "&TLS Ciphers" msgstr "&TLS Αλγόριθμοι Κρυπτογράφησης" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Δοκιμή" @@ -1038,7 +1038,7 @@ msgid "&Uploads:" msgstr "&Απεσταλμένα:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Χρήση προσαρμοσμένης εφαρμογής" @@ -1073,7 +1073,7 @@ msgid "&Username:" msgstr "&Όνομα χρήστη:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Έκδοση %s" @@ -1119,14 +1119,14 @@ 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 "" "Ο τύπος σύνδεσης 'Λογαριασμός ' δεν υποστηρίζεται από το επιλεγμένο " "πρωτόκολλο" -#: ../../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." @@ -1142,7 +1142,7 @@ "Οι τύποι σύνδεσης 'Τυπικός' και 'Λογαριασμός' δεν είναι διαθέσιμοι. Η " "καταχώρησή σας έχει αλλάξει σε 'Να ζητηθεί κωδικός πρόσβασης'." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1200,8 +1200,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 @@ -1260,7 +1260,7 @@ msgid "64-bit system" msgstr "Σύστημα 64 bit" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Προηγούμενο" @@ -1280,7 +1280,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Ο φάκελος δε μπορεί να συρθεί μέσα σε έναν από τους υποφακέλους του." @@ -1310,7 +1310,7 @@ "Ένα αρχείο με αυτό το όνομα ακόμα επεξεργάζεται. Παρακαλώ, κλείστε το και " "προσπαθήστε ξανά." -#: ../../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 " @@ -1328,7 +1328,7 @@ msgid "A new version of FileZilla is available:" msgstr "Μία νέα έκδοση του FileZilla είναι διαθέσιμη:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1346,7 +1346,7 @@ "Δεν απαιτείτε από έναν εξυπηρετητή σε κανονική λειτουργία. Επικοινωνήστε με " "το διαχειριστή του εξυπηρετητή." -#: ../../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?" @@ -1400,11 +1400,11 @@ #: ../../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: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" @@ -1430,7 +1430,7 @@ msgid "Active mode" msgstr "Ενεργητική κατάσταση" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1438,7 +1438,7 @@ "Η δοκιμή της ενεργητικής κατάστασης FTP απέτυχε. Το FileZilla δε γνωρίζει τη " "σωστή εξωτερική διεύθυνση IP." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1447,7 +1447,7 @@ "σωστή εξωτερική διεύθυνση IP. Επίσης, ο δρομολογητής (router) σας άλλαξε την " "διεύθυνση του παραλήπτη." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1461,7 +1461,7 @@ msgid "Active mode IP" msgstr "IP ενεργητικής κατάστασης" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Προσθήκη αρχείων στη &λίστα αναμονής" @@ -1481,7 +1481,7 @@ msgid "Add to queue" msgstr "Προσθήκη στη λίστα αναμονής" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Μη υποστηριζόμενος τύπος διεύθυνσης" @@ -1503,7 +1503,7 @@ "αναμένεται και μπορεί να βλάψουν το σύστημά σας. Χρησιμοποιείτε τις " "δοκιμαστικές εκδόσεις με δική σας ευθύνη." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Να &εκτελείται πάντα αυτή η ενέργεια" @@ -1511,7 +1511,7 @@ msgid "Algorithm:" msgstr "Αλγόριθμος:" -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Οι μεταφορά όλων των αρχείων ολοκληρώθηκε επιτυχώς" @@ -1519,7 +1519,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Όλες οι θύρες που θα δωθούν πρέπει να είναι μεταξύ 1024 και 65535." -#: ../../locales/../src/interface/QueueView.cpp:2939 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1534,11 +1534,11 @@ 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 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Εναλλακτικό όνομα:" @@ -1568,7 +1568,7 @@ "Εναλλακτικά, μπορείτε επίσης να κατεβάσετε την τελευταία έκδοση από την " "ιστοσελίδα:" -#: ../../locales/../src/interface/QueueView.cpp:1913 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1577,7 +1577,7 @@ "Προέκυψε σφάλμα κατά τη φόρτωση της Λίστας μεταφοράς από το \"%s\".\n" "Ορισμένα αντικείμενα ίσως δεν έχουν ανακτηθεί." -#: ../../locales/../src/interface/QueueView.cpp:1823 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1586,23 +1586,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/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 "Anonymous" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1615,11 +1615,11 @@ "Οι οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δε μπορούν να " "αποθηκευτούν." -#: ../../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 "Οποιαδήποτε αλλαγή γίνει στα φίλτρα δε θα αποθηκευτεί." @@ -1643,7 +1643,7 @@ msgid "Archive" msgstr "Αρχείο" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Υπερχείλιση μνήμης" @@ -1661,7 +1661,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Αίτημα για κωδικό πρόσβασης" @@ -1673,7 +1673,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Ερώτηση στο λειτουργικό σας σύστημα για την εξωτερική διεύθυνση IP" -#: ../../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 forums" @@ -1693,7 +1693,7 @@ msgid "Attribute" msgstr "Ιδιότητα" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Αποτυχία πιστοποίησης." @@ -1722,11 +1722,11 @@ msgid "B&ypass proxy" msgstr "&Παράκαμψη διαμεσολαβητή" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Κακός περιγραφέας αρχείου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Βασικές οδηγίες χρήσης" @@ -1739,7 +1739,7 @@ msgid "Being edited" msgstr "Επεξεργάστηκε" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Προσοχή! Το πιστοποιητικό έχει ανακληθεί" @@ -1757,11 +1757,11 @@ 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 "Σελιδοδείκτες" @@ -1777,7 +1777,7 @@ msgid "Build information" msgstr "Πληροφορίες κατασκευής" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Κατηγορία επιχείρισης:" @@ -1817,22 +1817,22 @@ msgid "CPU features:" msgstr "Χαρακτηριστικά ΚΜΕ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../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" @@ -1850,13 +1850,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 "Άκυρο" @@ -1875,15 +1875,15 @@ msgstr "" "Αδύνατη η πρόσβαση στο '%s', δεν υπάρχει μέσο ή ο οδηγός δεν είναι έτοιμος." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Αδυναμία προσθήκης του εξυπηρετητή στο διαχειριστή τοποθεσιών" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" 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?" @@ -1905,21 +1905,21 @@ #: ../../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:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1936,11 +1936,11 @@ msgid "Cannot load key file" msgstr "Αδυναμία φόρτωσης του Αρχείου Κλειδιού" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Αδυναμία φόρτωσης γραμμής εργαλείων από το αρχείο resource" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Να μην αποθηκεύονται οι κωδικοί πρόσβασης" @@ -1949,22 +1949,22 @@ 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:172 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Αδυναμία εύρεσης ονόματος κεντρικού υπολογιστή στην διεύθυνση IPv4 για χρήση " "με SOCKS4 διαμεσολαβητή." -#: ../../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 "Αδυναμία επιλογής φίλτρου" @@ -2033,7 +2033,7 @@ "Για την εφαρμογή των αλλαγών στο αρχείο συμβάντων απαιτείται η επανεκκίνηση " "του FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Θέμα κωδικοποίησης χαρακτήρων" @@ -2061,7 +2061,7 @@ msgid "Check for updates failed" msgstr "Επέτυχε ο έλεγχος για αναβαθμίσεις" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2069,7 +2069,7 @@ "Ελέγξτε τις πιστοποιήσεις εισόδου. Το καταχωρημένο όνομα αρχίζει ή τελειώνει " "με κενό διάστημα." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2077,7 +2077,7 @@ "Ελέγξτε τις πιστοποιήσεις εισόδου. Το καταχωρημένο όνομα αρχίζει ή τελειώνει " "με κενό διάστημα." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Έλεγχος για τη σωστή εξωτερική διεύθυνση IP" @@ -2085,12 +2085,12 @@ 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 "Αναντιστοιχία αθροίσματος ελέγχου (checksum) στο αρχείο %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Αναντιστοιχία αθροίσματος ελέγχου (checksum) στο αρχείο %s\n" @@ -2105,11 +2105,11 @@ #: ../../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 "Ακατάλληλος τερματισμός τμήματος δεδομένων" @@ -2147,7 +2147,7 @@ msgid "Clear quickconnect bar" msgstr "Καθαρισμός της γραμμής γρήγορης σύνδεσης" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Κάντε κλικ στο τέλος για να αποθηκεύσετε τις ρυθμίσεις σας." @@ -2164,8 +2164,8 @@ msgstr "Κλείσιμο &όλων των άλλων καρτελών" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Κλείσιμο του FileZilla" @@ -2193,13 +2193,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:525 msgid "Command not supported" msgstr "Η εντολή δεν υποστηρίζεται" @@ -2207,9 +2207,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 "Εντολή:" @@ -2217,12 +2217,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:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "" "Προβληματική επικοινωνία από το δρομολογητή (router) ή από το τοίχος " @@ -2271,7 +2271,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 "Διάκριση πεζών και κεφαλαίων χαρακτήρων" @@ -2287,24 +2287,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:576 msgid "Congratulations, your configuration seems to be working." msgstr "Συγχαρητήρια, οι ρυθμίσεις σας φαίνεται πως δουλεύουν." @@ -2312,6 +2312,11 @@ msgid "Connect bypassing proxy settings" msgstr "Η σύνδεση προσπέρασε τις ρυθμίσεις του διαμεσολαβητή" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Απέτυχε η σύνδεση με: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Σύνδεση στην τρέχουσα καρτέλα" @@ -2324,29 +2329,25 @@ msgid "Connect to specified Site Manager site" msgstr "Σύνδεση σε καθορισμένη τοποθεσία του διαχειριστή δικτυακού τόπου" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Συνδεδεμένος" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Σύνδεση" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1047 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Σύνδεση στο %s μέσω διακομιστή μεσολάβησης %s" -#: ../../locales/../src/engine/ControlSocket.cpp:955 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:369 +#: ../../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 "Σύνδεση στο %s..." @@ -2355,120 +2356,124 @@ msgid "Connection" msgstr "Σύνδεση" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Η σύνδεση ματαιώθηκε" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../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:240 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Απέτυχε η προσπάθεια σύνδεσης με \"%s\", προσπάθεια με την επόμενη διεύθυνση." -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../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 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Εξαντλήθηκε το χρονικό όριο σύνδεσης" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Σύνδεση τερματίστηκε" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Σύνδεση τερματίστηκε από τον εξυπηρετητή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../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:333 +msgid "Connection established, waiting for welcome message." +msgstr "Σύνδεση εδραιώθηκε, αναμονή για μήνυμα υποδοχής." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Σύνδεση εδραιώθηκε, αναμονή για μήνυμα υποδοχής..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Σύνδεση χάθηκε" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Μη επιτρεπτή σύνδεση σύμφωνα με τα καθορισμένα ορίσματα" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Η σύνδεση απορρίφθηκε" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Η σύνδεση απορρίφθηκε από το διακομιστή" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Επαναφορά σύνδεσης από το δίκτυο" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" 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] "Το χρονικό όριο της σύνδεσης έληξε %d δευτερόλεπτο αδράνειας" msgstr[1] "Το χρονικό όριο της σύνδεσης έληξε %d δευτερόλεπτα αδράνειας" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 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:249 msgid "Connection with proxy established, performing handshake..." msgstr "Η σύνδεση με το διαμεσολαβητή εδραιώθηκε, αναμονή για χειραψία..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Η σύνδεση με τον εξυπερετητή έκλεισε πρόωρα." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Η σύνδεση με το δοκιμαστικό εξυπηρετητή απέτυχε." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../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" @@ -2478,7 +2483,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "Αντιγραφή στο πρόχειρο των URLs (από τα επιλεγμέναν αντικείμενα)." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Αδυνατη η αποδοχή της σύνδεσης: %s" @@ -2488,30 +2493,30 @@ msgid "Could not add connection to Site Manager" msgstr "Αδυναμία εισαγωγής της σύνδεσης στο διαχειριστή τοποθεσιών" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 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:1084 +#: ../../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 "Αδυναμία αντιγραφής των URLs" @@ -2519,17 +2524,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 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Δεν είναι δυνατή η δημιουργία 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" @@ -2540,11 +2545,11 @@ "Ίσως η επέκταση του κελύφους δεν έχει εγκατασταθεί σωστά ή δεν τοποθετήσατε " "τα αρχεία στο παράθυρο του περιηγητή." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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 " @@ -2557,11 +2562,11 @@ "παραμέτρου γραμμής εντολών '--datadir ' ή ορίζοντας την " "μεταβλητή περιβάλλοντος FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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" @@ -2569,7 +2574,7 @@ "Αδυναμία λήψης διακεκριμένου ονόματος για τον εκδότη πιστοποίησης, απέτυχε " "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" @@ -2577,27 +2582,32 @@ "Αδυναμία λήψης διακεκριμένου ονόματος για το αντικείμενο πιστοποίησης, " "απέτυχε gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 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" @@ -2621,11 +2631,11 @@ 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:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2637,7 +2647,7 @@ "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου;" -#: ../../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 " @@ -2648,7 +2658,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 " @@ -2660,14 +2670,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" @@ -2680,42 +2690,50 @@ msgid "Could not parse server address:" msgstr "Αδυναμία ανάλυσης της διεύθυνσης του εξυπηρετητή:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Αδυναμία ανάγνωσης δεδομένων υποδοχής." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Αδυναμία ανάγνωσης από την υποδοχή: %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:344 +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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:2624 msgid "Could not spawn IO thread" msgstr "Αδύνατη η δημιουργία ΙΟ thread" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Αδύνατη η εκκίνηση χειραψίας με το διαμεσολαβητή: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../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 "" @@ -2737,7 +2755,7 @@ "Αδυναμία εγγραφής \"%s\", οι καθολικοί σελιδοδείκτες ήταν αδύνατο να " "αποθηκευτούν: %s" -#: ../../locales/../src/interface/QueueView.cpp:1852 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2746,9 +2764,9 @@ "Αδυναμία εγγραφής \"%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 "" @@ -2760,28 +2778,28 @@ msgid "Could not write \"%s\":" msgstr "Δεν ήταν δυνατή η εγγραφή \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Αδυναμία εγγραφής του Αρχείου Κλειδιού: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../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:983 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Αδυναμία εγγραφής στην υποδοχή: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Χώρα:" @@ -2789,11 +2807,11 @@ msgid "Crea&te new file" msgstr "&Δημιουργία νέου αρχείου" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Δημιουργήστε τον τοπικό κατάλογο που λείπει και εισέλθετε σε αυτόν" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "" "Δημιουργήστε τον απομακρυσμένο κατάλογο που λείπει και εισέλθετε σε αυτόν" @@ -2825,45 +2843,45 @@ 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: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:390 +#: ../../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:3171 +#: ../../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 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" 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" @@ -2895,7 +2913,7 @@ msgid "Cus&tom" msgstr "Προσ&αρμογή" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Προσαρμοσμένα ορίσματα φίλτρου" @@ -2922,6 +2940,10 @@ msgid "D&elete" msgstr "Δ&ιαγραφή" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "&Σύγκριση φακέλου" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Α&πενεργοποίηση όλων" @@ -2935,7 +2957,7 @@ msgstr "Ενέργεια δι&πλό-κλικ στους φακέλους:" #: ../../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 "Δι&πλότυπο" @@ -2951,8 +2973,8 @@ msgid "Data" msgstr "Δεδομένα" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Το socket δεδομένων έκλεισε πολύ σύντομα." @@ -3073,20 +3095,11 @@ 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: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 "Επιφάνεια Εργασίας" @@ -3108,7 +3121,7 @@ msgid "Dire&ctories" msgstr "Φάκε&λοι" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Κατεύθυνση" @@ -3116,13 +3129,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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Σύγκριση φακέλου" @@ -3136,11 +3149,11 @@ "Ο φάκελος που περιέχει το αρχείο συμβάντων δεν υπάρχει ή το όνομα του " "αρχείου δεν είναι έγκυρο." -#: ../../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 "Λίστα φακέλου απέτυχε" @@ -3148,12 +3161,12 @@ msgid "Directory listing filters" msgstr "Φίλτρα λίστας φακέλου" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Περιεχόμενα καταλόγου \"%s\" επιτυχές" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Λίστα φακέλου επιτυχής" @@ -3161,14 +3174,14 @@ msgid "Disa&ble all" msgstr "Απεν&εργοποίηση όλων" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "απομακρυσμένου φακέλου;" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3180,23 +3193,23 @@ msgid "Disconnect from server" 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:879 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../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 "Αποσύνδεση από τον εξυπηρετητή" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../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:380 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Αποσύνδεση από τον προηγούμενο εξυπηρετητή" @@ -3223,8 +3236,8 @@ msgstr "" "Κάντε το ίδιο με όλα τα επιλεγμένα αρχεία που είναι ήδη υπό επεξεργασία" -#: ../../locales/../src/interface/Mainfrm.cpp:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Θέλετε πραγματικά να κλείσετε το FileZilla;" @@ -3247,7 +3260,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Θέλετε πραγματικά να διαγράψετε τη λίστα αναμονής;" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Θέλετε πραγματικά να στείλετε το '%s' στον εξυπηρετητή;" @@ -3256,7 +3269,7 @@ msgid "Do you want to reopen this file?" msgstr "Θέλετε να ανοίξει εκ νέου αυτό το αρχείο;" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Τεκμηρίωση" @@ -3277,7 +3290,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 "&Όριο λήψης:" @@ -3291,9 +3304,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 "Λήψη αποτελεσμάτων αναζήτησης" @@ -3305,7 +3318,7 @@ msgid "Download selected files and directories" msgstr "Λήψη των επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3318,26 +3331,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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3347,9 +3352,9 @@ "Το Drag&Drop ανάμεσα στα διαφορετικά στιγμιότυπα του 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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3383,7 +3388,7 @@ msgid "E&xport..." msgstr "E&ξαγωγή..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-Mail:" @@ -3402,16 +3407,16 @@ "Τροποποιήστε το αρχείο με έναν επεξεργαστή και στείλτε τις αλλαγές στον " "εξυπηρετητή." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" 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 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Επεξεργασία αποτελεσμάτων αναζήτησης" @@ -3419,7 +3424,7 @@ msgid "Email:" msgstr "E-Mail:" -#: ../../locales/../src/interface/QueueView.cpp:2125 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Κενή εντολή" @@ -3427,7 +3432,7 @@ msgid "Empty command." msgstr "Κενή εντολή." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Άδειασμα λίστας φακέλου" @@ -3435,6 +3440,11 @@ 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 "Κενή επέκταση αρχείου." @@ -3473,7 +3483,7 @@ msgid "Encryption details" msgstr "Λεπτομέρειες κρυπτογράφησης" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Να ολοκληρωθεί σύγκριση και η αλλαγή των ορισμάτων ταξινόμησης;" @@ -3481,15 +3491,15 @@ msgid "Enter &custom command..." msgstr "Εισαγωγή &προσαρμοσμένης εντολής..." -#: ../../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:2114 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Εισαγωγή εντολής" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Εισαγωγή προσαρμοσμένης εντολής" @@ -3503,11 +3513,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 "Εισαγωγή νέου ονόματος για τα ορίσματα φίλτρου" @@ -3548,7 +3558,7 @@ "- ftps: // για FTP μέσω TLS (σιωπηρά)\n" "- ftpes: // για FTP μέσω TLS (σαφή)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3578,7 +3588,7 @@ msgid "Error importing" msgstr "Σφάλμα εισαγωγής" -#: ../../locales/../src/interface/QueueView.cpp:1914 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "Σφάλμα κατά τη φόρτωση της Λίστας αναμονής" @@ -3587,50 +3597,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:1835 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 +#: ../../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: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:939 msgid "Error loading xml file" msgstr "Σφάλμα φόρτωσης xml αρχείου" -#: ../../locales/../src/interface/QueueView.cpp:1824 +#: ../../locales/../src/interface/QueueView.cpp:1819 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:1853 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 +#: ../../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: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 "Σφάλμα:" @@ -3723,24 +3733,24 @@ 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/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 "Αποτυχία αντιγραφής ή μετακίνησης τοποθεσιών" @@ -3748,113 +3758,117 @@ msgid "Failed to create backup copy of xml file" msgstr "Απέτυχε η δημιουργία αντιγράφου ασφαλείας για το αρχείου xml" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 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:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "" "Αποτυχία δημιουργίας listen 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:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "Αποτυχία λήψης ομότιμης διεύθυνσης, η σύνδεση έκλεισε." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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: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:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../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 "Αδυναμία φόρτωσης πινάκων οργάνων, λάθος resource αρχείο;" -#: ../../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:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Αποτυχία ανοίγματος του \"%s\" για επισύναψη/εγγραφή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, 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:2525 +#: ../../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:1003 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:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, ακύρωση" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, χρήση τοπικής διεύθυνσης" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP. Ακύρωση" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 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)." @@ -3862,14 +3876,14 @@ "Αποτυχία ορισμού γλώσσας σε %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" @@ -3877,14 +3891,14 @@ "Αποτυχία ορισμού γλώσσας σε %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 "" @@ -3895,11 +3909,11 @@ 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" @@ -3932,7 +3946,7 @@ msgid "File Types" msgstr "Τύποι αρχείων" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "O περιγραφέας αρχείου δεν είναι υποδοχέας" @@ -3944,7 +3958,7 @@ msgid "File editing" msgstr "Επεξεργασία αρχείου" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Το αρχείο υπάρχει" @@ -3961,8 +3975,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 "Το αρχείο δε βρέθηκε" @@ -3971,38 +3985,38 @@ msgid "File search" msgstr "Aναζήτηση αρχείου" -#: ../../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:1137 msgid "File transfers still in progress." msgstr "Μεταφορά αρχείων σε πρόοδο." @@ -4014,7 +4028,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" @@ -4028,11 +4042,11 @@ "Το 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:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "Το FileZilla πρέπει να επανεκκινηθεί για να εφαρμοστεί η γλωσσική αλλαγή." @@ -4047,7 +4061,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 @@ -4058,14 +4072,14 @@ msgid "Filename &filters..." msgstr "Όνομα αρχείου &φίλτρων..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "" "Δεν μπορεί να κατασκευαστεί όνομα αρχείου για τον φάκελο %s και το αρχείο %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Λανθασμένο όνομα αρχείου" @@ -4097,7 +4111,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" @@ -4107,7 +4121,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" @@ -4145,8 +4159,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 "Τα ορίσματα φίλτρου υπάρχουν ήδη" @@ -4160,11 +4174,11 @@ msgid "Filter validation failed" msgstr "Αποτυχία πιστοποίησης φίλτρου" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Αναζήτηση &αρχείων" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Αναζήτηση &φακέλων" @@ -4181,7 +4195,7 @@ msgid "Fingerprint:" msgstr "Αποτύπωμα:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Οδηγός ρύθμισης δρομολογητή (router) και τοίχους προστασίας (firewall)" @@ -4213,7 +4227,7 @@ msgid "Force showing &hidden files" msgstr "Εμφάνιση των &κρυφών αρχείων" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Εξαναγκασμένη εμφάνιση των κρυφών αρχείων" @@ -4228,12 +4242,12 @@ "της συσχετιζόμενης εφαρμογής και ακολουθούν τα ορίσματα, με σωστή σύνταξη." #. @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 "Βρέθηκε νέα %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Περαιτέρω τεκμηρίωση" @@ -4241,7 +4255,7 @@ msgid "General" msgstr "Γενικά" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Γενική αποτυχία εξυπηρετητή SOCKS" @@ -4254,12 +4268,12 @@ msgid "Get external IP address from the following URL:" msgstr "Λήψη εξωτερικής διεύθυνσης IP από την ακόλουθη URL:" -#: ../../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 "Το εν λόγω όνομα των ορισμάτων φίλτρου υπάρχει ήδη, να αντικατασταθεί;" @@ -4267,22 +4281,22 @@ msgid "Global bookmarks" msgstr "Καθολικοί σελιδοδείκτες" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Σφάλμα GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" 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 "Σφάλμα GnuTLS %d στο %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Σφάλμα GnuTLS %d: %s" @@ -4312,17 +4326,17 @@ msgstr "Κρυφό" #: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Υψηλή" -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../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 "O υψηλότερος αριθμός θύρας πρέπει να είναι ανάμεσα στο 1024 και 65535." @@ -4337,7 +4351,7 @@ msgid "Homepage:" msgstr "Προσωπική Σελίδα:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Ο κόμβος είναι εκτός λειτουργίας" @@ -4353,7 +4367,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Ο κόμβος ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Μη προσπελάσιμος κόμβος" @@ -4372,7 +4386,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (παράδειγμα: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Οι διευθύνσεις IPv6 δεν υποστηρίζονται με SOCKS4 διαμεσολαβητή" @@ -4422,7 +4436,7 @@ "Αν η αλλαγή του κλειδιού δεν ήταν αναμενόμενη, παρακαλώ επικοινωνήστε με το " "διαχειριστή του συστήματος." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4430,7 +4444,7 @@ "Εάν το πρόβλημα συνέχισει να υπάρχει, πιθανόν κάποιος δρομολογητής ή " "firewall συνεχίζει να εμποδίζει το FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4449,7 +4463,7 @@ "επικαλύπτοντας παλαιότερα αρχεία συμβάντων), με αποτέλεσμα την δημιουργία " "νέου αρχείου." -#: ../../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." @@ -4458,7 +4472,7 @@ "διαγράψει τη συμβολική σύνδεση είτε να αφαιρέσει τα περιεχόμενα του " "συνδεμένου φακέλου." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4466,7 +4480,7 @@ "Εάν το πρόβλημα συνέχισει να υπάρχει, επικοινωνήστε με τον κατασκευαστή του " "δρομολογητή ή firewall σας για κάποια λύση." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή του δρομολογητή " @@ -4505,7 +4519,7 @@ "Εάν κάνετε κλικ στο δοκιμή, το FileZilla θα συνδεθεί στο probe.filezilla-" "project.org και θα εκτελέσει κάποιες απλές δοκιμές." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Εάν κλείσετε το FileZilla, οι αλλαγές θα χαθούν" @@ -4529,7 +4543,7 @@ "Εάν έχετε προβλήματα στην ανάκτηση των λιστών φακέλων ή στην μεταφορά " "αρχείων, δοκιμάστε να αλλάξετε την προκαθορισμένη κατάσταση μεταφοράς." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4565,7 +4579,7 @@ "Εάν χρησιμοποιείτε κάποιο δρομολογητή (router), ελέγξτε αν όλες αυτές οι " "θύρες μπορούν να προωθήσουν δεδομένα στον υπολογιστή που τρέχει το FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4627,7 +4641,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" @@ -4635,7 +4649,7 @@ "Ελλιπής αλυσίδα, το κορυφαίο πιστοποιητικό δεν είναι υπογεγραμμένο " "πιστοποιητικό από την αρμόδια αρχή έκδοσης πιστοποιητικών" -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Λανθασμένος κωδικός πρόσβασης" @@ -4647,17 +4661,21 @@ "Δεν μπόρεσαν να ανακτηθούν πληροφορίες σχετικά με την πιο πρόσφατη έκδοση " "του FileZilla. Παρακαλώ δοκιμάστε ξανά αργότερα." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 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:730 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/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Διαδραστικός" @@ -4665,29 +4683,29 @@ msgid "Interface" msgstr "Διεπαφή" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Διακόπηκε με σύνθημα" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../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 "Μη έγκυρο μέγεθος περιεχομένων" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Μη έγκυρη απάντηση HTTP" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" 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." @@ -4695,18 +4713,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:363 +#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:380 +#: ../../locales/../src/interface/netconfwizard.cpp:397 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 "Λανθασμένη ημερομηνία" @@ -4747,38 +4766,38 @@ "ftps:// για FTP μέσω TLS (σιωπηρά) και\n" "ftpes:// για FTP μέσω TLS (σαφή)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Μη έγκυρος κόμβος. Μετά την αγκύλη κλεισίματος πρέπει να ακολουθούν η άνω " "κάτω τελεία και η θύρα." -#: ../../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 "Μη έγκυρη διαδρομή" @@ -4790,23 +4809,23 @@ msgid "Invalid username given." msgstr "Δόθηκε μη έγκυρο όνομα χρήστη." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Μη έγκυρη τιμή για ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" 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 "Περιφέρεια ή νομαρχία δραστηριοποίησης:" @@ -4814,7 +4833,7 @@ msgid "Keep directories on top" msgstr "Κράτησε τους φακέλους στο επάνω μέρος" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4849,11 +4868,11 @@ msgid "Language" msgstr "Γλώσσα" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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" @@ -4883,7 +4902,7 @@ msgid "Limit:" msgstr "Όριο:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Το μήκος γραμμής ξεπεράστηκε" @@ -4891,13 +4910,14 @@ msgid "Linked against" msgstr "Πρόσθετα στοιχεία" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 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 "Λίστα:" @@ -4910,11 +4930,11 @@ msgid "Local" msgstr "Τοπικά" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Τοπική διεύθυνση σε χρήση" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Το τοπικό καταληκτικό σημείο έχει κλείσει" @@ -4922,21 +4942,21 @@ 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 "Το τοπικό αρχείο δεν έχει έγκυρο όνομα αρχείου." @@ -4948,7 +4968,7 @@ msgid "Local site:" msgstr "Τοπική τοποθεσία:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Τοποθεσία:" @@ -4956,12 +4976,16 @@ msgid "Log file" msgstr "Αρχείο Συμβάντων" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +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: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." @@ -4970,7 +4994,7 @@ "να μην υποστηρίζει UTF-8. Δεν είναι δυνατή η επαναφορά στην τοπική " "κωδικοποίηση χαρακτήρων που χρησιμοποιεί ο διαμεσολαβητής." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4978,7 +5002,7 @@ "Τα στοιχεία σύνδεσης περιέχουν μη-ASCII χαρακτήρες και ο εξυπηρετητής μπορεί " "να μην υποστηρίζει UTF-8. Δοκιμάστε μια τοπική κωδικοποίηση χαρακτήρων." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Η ακολουθία σύνδεσης που εκτελείται δε διεκπεραιώθηκε ακόμα, δε συνδέθηκε. " @@ -4999,17 +5023,17 @@ "Ο τύπος σύνδεσης, μπορεί να χρησιμοποιείτε συγχρόνως με μόνο μία διεύθυνση " "FTP. Τα ορίσματα πρέπει να είναι είτε'%s' είτε '%s'" -#: ../../locales/../src/interface/queue.cpp:865 -#: ../../locales/../src/interface/queue.cpp:952 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Χαμηλή" -#: ../../locales/../src/interface/queue.cpp:863 -#: ../../locales/../src/interface/queue.cpp:950 +#: ../../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 και " @@ -5025,46 +5049,46 @@ "Σιγουρευτείτε, ότι το αρχείο μπορεί να προσπελαστεί και είναι ένα " "καλοσχηματισμένο έγγραφο 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 "Να μην ταιριάζει με οτιδήποτε από τα ακόλουθα" @@ -5072,12 +5096,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Μέγιστος αριθμός ταυτόχρονων &μεταφορών:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Αποτυχία εκχώρησης μνήμης" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Αρχείο συμβάντων" @@ -5085,7 +5109,7 @@ msgid "Message log position" msgstr "Θέση αρχείου συμβάντων" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Πολύ μεγάλο μήνυμα" @@ -5105,15 +5129,15 @@ msgid "Move &up" msgstr "Μετακίνηση &πάνω" -#: ../../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" @@ -5134,7 +5158,7 @@ msgstr "To όνομα ήδη υπάρχει" #: ../../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 "To εν λόγω όνομα σελιδοδείκτη υπάρχει ήδη." @@ -5150,7 +5174,7 @@ 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 "Πρέπει να καταχωρίσετε έγκυρη απομακρυσμένη διαδρομή" @@ -5158,11 +5182,11 @@ msgid "Need to specify a character encoding" msgstr "Πρέπει να ορίσετε μία κωδικοποίηση χαρακτήρων" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Δεν είναι γνωστό το όνομα του κόμβου ούτε το όνομα του εξυπηρετητή" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5170,8 +5194,8 @@ "Ο υποδοχέας δικτύου δεν διαθέτει διευθύνσεις που ανήκουν στην αιτούμενη " "οικογένεια διευθύνσεων" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Μη προσπελάσιμο δίκτυο" @@ -5187,7 +5211,7 @@ msgid "New &tab" msgstr "Νέα &καρτέλα" -#: ../../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 "Νέος σελιδο&δείκτης" @@ -5206,14 +5230,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 "Νέος φάκελος" @@ -5230,9 +5254,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 "Νέα τοποθεσία" @@ -5240,11 +5264,11 @@ 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 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Καμία διεύθυνση που να σχετίζεται με το όνομα του κόμβου" @@ -5252,11 +5276,11 @@ msgid "No category to export selected" msgstr "Δεν έχει επιλεχθεί καμία κατηγορία για εξαγωγή" -#: ../../locales/../src/interface/QueueView.cpp:2125 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Δεν δόθηκε εντολή, ματαίωση." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "" "Καμία εξωτερική διεύθυνση IP δεν έχει οριστεί, δοκιμή της προκαθορισμένης." @@ -5279,27 +5303,27 @@ msgid "No images available" msgstr "Καμία διαθέσιμη εικόνα" -#: ../../locales/../src/interface/QueueView.cpp:2970 +#: ../../locales/../src/interface/QueueView.cpp:2974 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:1053 msgid "No route to host" msgstr "Δεν υπάρχει δρομολογητής να φιλοξενηθεί" @@ -5307,11 +5331,11 @@ 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:484 msgid "No supported SOCKS5 auth method" msgstr "Μη υποστηριζόμενη μέθοδος έγκρισης SOCKS5" @@ -5321,7 +5345,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 "Κανένα" @@ -5329,18 +5353,18 @@ msgid "None selected yet" msgstr "Τίποτε δεν έχει επιλεχθεί ακόμα" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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:868 -#: ../../locales/../src/interface/queue.cpp:955 +#: ../../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 "Τυπικός" @@ -5350,16 +5374,16 @@ 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: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:561 msgid "Not connected to any server." msgstr "Δεν έχει συνδεθεί με κανέναν εξυπηρετητή." @@ -5367,11 +5391,11 @@ msgid "Not connected." msgstr "Δεν έχει συνδεθεί." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Δεν έγινε προετοιμασία, πρέπει να επικαλεστείτε WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Σημείωση: Αυτό το χαρακτηριστικό υποστηρίζεται μόνο από το πρωτόκολλο FTP." @@ -5415,13 +5439,13 @@ #: ../../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" @@ -5439,7 +5463,7 @@ "Στις επόμενες σελίδες, θα ρυθμιστεί η κατάσταση μεταφοράς, καθώς και η " "κατάσταση επιστροφής αν είναι ενεργοποιημένη." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Μία" @@ -5487,8 +5511,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 "Αποτυχία ανοίγματος" @@ -5511,19 +5535,19 @@ msgid "Operating System:" msgstr "Λειτουργικό Σύστημα:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Η λειτουργία είναι ήδη σε εξέλιξη" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Λειτουργία σε εξέλιξη" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Η λειτουργία δεν υποστηρίζεται" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Οργανισμός:" @@ -5531,16 +5555,16 @@ msgid "Other SFTP options" msgstr "Άλλες SFTP επιλογές" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" 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:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Εξαντλήθηκε η μνήμη" @@ -5589,7 +5613,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Αντικατάσταση αν είναι διαφορετικού &μεγέθους ή αν είναι νεώτερο" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Τύπος ίδιας κατασκευής: %s\n" @@ -5616,7 +5640,7 @@ msgid "P&roxy host:" msgstr "Κόμβος διαμεσολαβητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "" "Η εντολή PORT μολύνθηκε από το δρομολογητή (router) ή από το τοίχος " @@ -5626,11 +5650,11 @@ msgid "Pa&ssive (recommended)" msgstr "Πα&θητική (συνιστάται)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Η παράμετρος δεν είναι έγκυρη URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Αναλύθηκαν τα %d bytes των πληροφοριών της έκδοσης.\n" @@ -5650,13 +5674,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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:621 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 "Απαιτείται κωδικός πρόσβασης" @@ -5665,13 +5689,13 @@ msgid "Path" msgstr "Διαδρομή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Αδυναμία δημιουργίας διαδρομής για τον φάκελο %s και τον υποφάκελο %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Η διαδρομή δεν βρέθηκε:" @@ -5690,8 +5714,8 @@ msgid "Permission" msgstr "Άδεια" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Άρνηση πρόσβασης" @@ -5704,7 +5728,7 @@ msgid "Platform:" msgstr "Πλατφόρμα:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5721,13 +5745,13 @@ "(routers) έτσι ώστε το FileZilla να μπορεί να εδραιώσει εξωτερικές συνδέσεις " "σε αυθαίρετες θύρες." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5765,7 +5789,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\"" @@ -5801,7 +5825,7 @@ msgid "Please enter a password for this server:" msgstr "Παρακαλώ, καταχωρίστε τον κωδικό γι' αυτό τον εξυπηρετητή:" -#: ../../locales/../src/interface/QueueView.cpp:2114 +#: ../../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" @@ -5818,7 +5842,7 @@ "Παρακαλούμε εισάγετε ένα χρονικό όριο μεταξύ 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 "Παρακαλώ, καταχωρίστε ένα μοναδικό όνομα για αυτό το όρισμα φίλτρου" @@ -5826,11 +5850,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 "" "Παρακαλώ καταχωρίστε ένα URL από το οποίο παίρνετε την εξωτερική σας " @@ -5844,7 +5868,7 @@ "Παρακαλώ, καταχωρίστε ένα όριο ταχύτητας αποστολής μεγαλύτερο ή ίσο με 0 %s/" "s." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5852,14 +5876,14 @@ "Παρακαλώ, καταχωρίστε μία ακατέργαστη εντολή 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/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 "Παρακαλώ, καταχωρίστε το όνομα του αρχείου που πρέπει να δημιουργηθεί:" @@ -5869,12 +5893,12 @@ "Παρακαλώ, καταχωρίστε όνομα χρήστη και κωδικό πρόσβασης γι' αυτό τον " "εξυπηρετητή:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 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: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 " @@ -5893,7 +5917,7 @@ "Παρακαλώ, ακολουθήστε τις οδηγίες προσεκτικά, καθώς η εσφαλμένη ρύθμιση θα " "αποτρέψει τις επιτυχημένες συνδέσεις FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5902,13 +5926,13 @@ "και ελέγξτε αν έχετε πληκτρολογήσει σωστά την διεύθυνση του αναλυτή " "διευθύνσεων." -#: ../../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 "" "Σιγουρευτείτε ότι η αιτούμενη τοπική προσαρμογή θα εγκατασταθεί στο σύστημα " "σας." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5933,7 +5957,7 @@ "trojan ή άλλο κακόβουλο πρόγραμμα. Αυτό μπορεί να προκαλέσει λάθος συναγερμό " "που εσείς πρέπει να αγνοήσετε." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5951,7 +5975,7 @@ "απαγορέψουν την πρόσβαση, αν προσπαθείτε να επανασυνδεθείτε σε τακτά και " "πολύ μικρά χρονικά διαστήματα." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5961,7 +5985,7 @@ "περίπτωση που ξαφνικά υπάρχουν προβλήματα με εξυπηρετητές που λειτουργούσαν " "παλαιότερα." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Παρακαλώ, επιλέξτε ενέργεια:" @@ -5997,7 +6021,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τα επιλεγμένα αρχεία." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -6015,8 +6039,8 @@ msgid "Positio&n of the message log:" msgstr "Θέ&ση του αρχείου συμβάντων:" -#: ../../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 "Ταχυδρομικός κωδικός:" @@ -6028,12 +6052,12 @@ msgid "Preallocation" 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:686 msgid "Preserving file timestamps" msgstr "Διατήρηση των χρονικών σφραγίδων στα αρχεία" @@ -6041,7 +6065,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 "" "Η κύρια σύνδεση και τα πιστοποιητικά σύνδεσης δεδομένων δεν ταιριάζουν." @@ -6060,7 +6084,7 @@ msgid "Prioritize directories (default)" msgstr "Προταιρεότητα στους φακέλους (προκαθορισμένο)" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Προτεραιότητα" @@ -6090,7 +6114,7 @@ msgid "Process &Queue" msgstr "Επεξεργασία &λίστας αναμονής" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Διαδικασία υπερχείλισης πίνακα αρχείων" @@ -6100,11 +6124,11 @@ msgid "Processed %s in %s." msgstr "Επεξεργασμένα %s από %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Το πρωτόκολλο δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Το πρωτόκολλο δεν υποστηρίζεται από το συγκεκριμένο τύπο υποδοχέα" @@ -6121,38 +6145,42 @@ msgid "Proxy &user:" msgstr "Διαμεσολαβητής &χρήστη:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Αποτυχία πιστοποίησης διαμεσολαβητή" -#: ../../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 "Απέτυχε η χειραψία με το διαμεσολαβητή: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Ο διαμεσολαβητής ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, 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:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Το αίτημα απορρίφτηκε από το διακομιστή. Η απάντηση του διακομιστή: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Απέτυχε το αίτημα του διαμεσολαβητή: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Το αίτημα του διαμεσολαβητή απορρίφθηκε: Άγνωστος τύπος διεύθυνσης ως " "απάντηση κατά την σύνδεση" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Μη έγκυρη θύρα διαμεσολαβητή" @@ -6168,7 +6196,7 @@ msgid "Public permissions" msgstr "Δημόσια δικαιώματα" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Η λίστα αναμονής έχει υποβληθεί σε πλήρης επεξεργασία" @@ -6187,11 +6215,11 @@ msgid "Queue: empty" msgstr "Λίστα αναμονής: κενή" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "Αρχεία σε λίστα αναμονής" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Λίστα αναμονής:" @@ -6208,7 +6236,7 @@ msgid "R&eset and requeue selected files" msgstr "Ε&παναφορά και επανατοποθέτηση των επιλεγμένων αρχείων" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Aκατέργαστη εντολή FTP" @@ -6225,7 +6253,7 @@ msgid "Re&name" msgstr "Με&τονομασία" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6242,12 +6270,12 @@ msgid "Read-only" msgstr "Μόνο-Ανάγνωση" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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 "" @@ -6256,36 +6284,36 @@ msgstr[1] "" "Να διαγραφούν οι φάκελοι %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 από το διακομιστή;" msgstr[1] "Να διαγραφούν τα αρχεία %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:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Αιτία" -#: ../../locales/../src/interface/QueueView.cpp:3043 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Επανεκκίνηση τώρα" @@ -6293,38 +6321,38 @@ msgid "Rec&urse into subdirectories" msgstr "Επα&ναληπτικά στους υποφακέλους" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ελήφθη προειδοποίηση TLS από το διακομιστή: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2969 +#: ../../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:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Λαμβάνονται ανεπιθύμητα δεδομένα" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Λήφθηκαν μη έγκυροι χαρακτήρες στις πληροφορίες έκδοσης" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:515 msgid "Received version information is too large" msgstr "Λήφθηκαν πληροφοριών έκδοσης υπερβολικά μεγάλες" @@ -6358,13 +6386,13 @@ msgid "Recursively deleting files and directories." 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" @@ -6374,7 +6402,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 "Απομνημόνευση κωδικών πρόσβασης;" @@ -6382,20 +6410,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:1169 +#: ../../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 "Αναζήτηση απομακρυσμένου αρχείου" @@ -6435,11 +6463,11 @@ "Αδυναμία προσπέλασης της απομακρυσμένης διαδρομής. Βεβαιωθείτε ότι είναι " "έγκυρη διαδρομή." -#: ../../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 "Διαχείριση απομακρυσμένης διαδρομής:" @@ -6479,30 +6507,30 @@ msgid "Rename selected files and directories" msgstr "Μετονομασία επιλεγμένων αρχείων και φακέλων" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../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:398 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Το αίτημα απορρίφθηκε - ο πελάτης στόχος δεν εκτελείται (ή δεν ελιναι " "προσβάσιμος από το διακομιστή)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:401 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Το αίτημα απορρίφθηκε - ο πελάτης στόχος δεν μπόρεσε να επιβεβαιώσει την ID " "συμβολοσειρά χρήστη" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Τό αίτημα απορρίφθηκε ή απέτυχε" @@ -6518,28 +6546,28 @@ msgid "Reset and requeue &all" msgstr "Επαναφορά και επανατοποθέτηση &όλων" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Το πρωτόκολλο είναι αγνωστό" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../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" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 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:113 +#: ../../locales/../src/interface/netconfwizard.cpp:411 +#: ../../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 "Αποτελέσματα:" @@ -6559,19 +6587,19 @@ "εξυπηρετητής χρησιμοποιεί διαφορετική μορφή τερματισμού γραμμής από τον " "πελάτη." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Ανάκτηση περιεχόμενων καταλόγου \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../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:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ανάκτηση εξωτερικής διεύθυνσης IP από %s" @@ -6588,7 +6616,7 @@ msgid "S&hutdown system" msgstr "Τ&ερματισμός συστήματος" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Διακοπή" @@ -6608,7 +6636,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Ο διαμεσολαβητής SOCKS4 θα συνδεθεί με: %s" @@ -6617,35 +6645,35 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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:1712 +#: ../../locales/../src/interface/QueueView.cpp:1710 msgid "Scanning for files to add to queue" msgstr "Ανίχνευση αρχείων για πρόσθεση στην ουρά αναμονής" -#: ../../locales/../src/interface/QueueView.cpp:1714 +#: ../../locales/../src/interface/QueueView.cpp:1712 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 "Όροι &αναζήτησης:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Aναζήτηση &φακέλου:" @@ -6661,8 +6689,8 @@ msgid "Security information" msgstr "Πληροφορίες ασφαλείας" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Δείτε επίσης: https://wiki.filezilla-project.org/Network_Configuration" @@ -6715,7 +6743,7 @@ msgstr "Επιλογή αρχείου για τα εξαγόμενα δεδομένα" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1454 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Επιλογή αρχείου για την εξαγόμενη λίστα αναμονής" @@ -6724,7 +6752,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 "Επιλογή αρχείου για τις εξαγόμενες τοποθεσίες" @@ -6732,23 +6760,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 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" 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 "Επιλογή ονόματος αρχείου προορισμού" @@ -6760,7 +6788,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." @@ -6775,7 +6803,7 @@ msgstr[0] "Επιλεγμένος %d φάκελος." msgstr[1] "Επιλεγμένοι %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." @@ -6796,7 +6824,7 @@ msgstr[0] "Επιλεγμένο %d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s" msgstr[1] "Επιλεγμένα %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 για μεταφορά." @@ -6834,7 +6862,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 "Το επιλεγμένο φίλτρο λειτουργεί μόνο για τα τοπικά αρχεία." @@ -6861,12 +6889,12 @@ "Αποστολή προσαρμοσμένης εντολής στον εξυπηρετητή, σε διαφορετική περίπτωση " "δεν είναι διαθέσιμος" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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 "Σειριακός Αριθμός:" @@ -6874,21 +6902,21 @@ msgid "Server &Type:" msgstr "Τύπος &εξυπηρετητή:" -#: ../../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:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Ο εξυπηρετητής δεν υποστηρίζει χαρακτήρες που δεν είναι ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6897,15 +6925,15 @@ "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > %d GB. Τερματισμός " "μεταφοράς εφόσον το μέγεθος ταιριάζει." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6914,7 +6942,7 @@ "Ο εξυπηρετητής ίσως να μην υποστηρίζει την επαναφορά αρχείων > %d GB. " "Τερματισμός μεταφοράς εφόσον το μέγεθος ταιριάζει." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6922,11 +6950,11 @@ "Ο εξυπηρετητής απαιτεί έναν λογαριασμό. Ορίστε έναν λογαριασμό " "χρησιμοποιώντας το διαχειριστή τοποθεσιών" -#: ../../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." @@ -6934,13 +6962,13 @@ "Ο εξυπηρετητής υπαγορεύει τη σύνδεση. Πρέπει να χρησιμοποιήσετε το " "διαδραστικό τύπο σύνδεσης." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Ο εξυπηρετητής απέστειλε παθητική απάντηση σε μη-δρομολογήσιμη διεύθυνση. " "Απέτυχε η παθητική μέθοδος λειτουργίας." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6949,14 +6977,14 @@ "Χρήση της διεύθυνσης του εξυπηρετητή." #: ../../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: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 "Ο εξυπηρετητής έστειλε μία αναπάντεχη απάντηση." @@ -6972,7 +7000,7 @@ msgid "Server&type:" msgstr "&Τύπος εξυπηρετητή:" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Εξυπηρετητής/Τοπικό αρχείο" @@ -6989,13 +7017,13 @@ msgid "Set &Priority" msgstr "Ορισμός &Προτεραιότητας" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../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 κλήθηκε χωρίς όνομα υποδοχής" @@ -7015,7 +7043,7 @@ msgid "Show &welcome dialog..." msgstr "Εμφάνιση του διαλόγου &καλωσορίσματος..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "" "Να εμφανιστούν οι δομές των φακέλων και να συνεχιστεί η σύγκριση μεταξύ τους;" @@ -7038,7 +7066,7 @@ msgid "Shows this help dialog" msgstr "Εμφάνιση του διαλόγου βοήθειας" -#: ../../locales/../src/interface/QueueView.cpp:3039 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Τερματισμός συστήματος" @@ -7078,23 +7106,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 "Η διαδρομή τοποθεσίας είναι κακοσχηματισμένη." @@ -7113,7 +7141,7 @@ "αποθηκευτούν στο Διαχειριστή Τοποθεσιών\n" "Να προσθέτει η τρέχουσα σύνδεση στον διαχειριστή τοποθεσιών;" -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Μέγεθος" @@ -7132,43 +7160,43 @@ 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: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:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../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:1047 msgid "Socket address outside address space" msgstr "Υπερχείλιση διεύθυνσης υποδοχέα (Socket)" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Ο υποδοχέας (Socket) είναι ήδη συνδεδεμένος" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Τερματίστηκε η λειτουργία υποδοχέα" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Ο υποδοχέας (Socket) δεν είναι συνδεδεμένος" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Ο τύπος υποδοχέα δεν υποστηρίζεται την οικογένεια διευθύνσεων" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Κάποια αρχεία ακόμα επεξεργάζονται ή πρέπει να αποσταλούν." @@ -7186,7 +7214,7 @@ msgid "Sort directories inline" msgstr "Ταξινόμηση φακέλων σε σειρά" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "Η εντολή ταξινόμησης δε μπορεί να αλλάξει κατά την σύγκριση των φακέλων." @@ -7203,7 +7231,7 @@ msgid "Source and path of the drop operation are identical" msgstr "Η προέλευση και η διαδρομή της ενέργειας Drop είναι ταυτόσημη" -#: ../../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 "Το πηγαίο αρχείο και αρχείο προορισμού δεν πρέπει να είναι ίδια" @@ -7215,7 +7243,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" @@ -7253,19 +7281,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:2147 +#: ../../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:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Εκκίνηση αποστολής του %s" @@ -7274,18 +7302,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:1169 +#: ../../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 "Κατάσταση:" @@ -7297,7 +7325,7 @@ msgid "Stop recursive operation" msgstr "Διακοπή Αναδρομικής Λειτουργίας" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Οδός:" @@ -7313,11 +7341,11 @@ msgid "Summary of test results:" msgstr "Σύνοψη αποτελεσμάτων δοκιμής:" -#: ../../locales/../src/interface/QueueView.cpp:3047 +#: ../../locales/../src/interface/QueueView.cpp:3051 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." @@ -7325,24 +7353,24 @@ "Οι Συμβολικές συνδέσεις στα αρχεία δεν επηρεάζονται από αυτή την επιλογή, " "τέτοιες συμβολικές συνδέσεις διαγράφονται πάντα." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Συγχρονισμός περιήγησης" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Ο Συγχρονισμός περιήγησης έχει απενεργοποιηθεί." @@ -7356,8 +7384,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Συντακτικό σφάλμα στην γραμμή εντολών" @@ -7369,11 +7397,11 @@ msgid "System details" msgstr "Λεπτομέρειες Συστήματος" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Υπέρβαση ορίου ανοιχτών αρχείων συστήματος" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Αποτυχία λειτουργίας υποσυστήματος δικτύου" @@ -7381,19 +7409,19 @@ msgid "T&oolbar" msgstr "&Γραμμή εργαλείων" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Η TLS σύνδεση πραγματοποιήθηκε, αποστολή αίτησης HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "Η TLS σύνδεση πραγματοποιήθηκε, αναμονή για μήνυμα υποδοχής..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Η TLS σύνδεση πραγματοποιήθηκε." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "Έληξε TTL" @@ -7405,15 +7433,15 @@ 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:1068 msgid "Temporary failure in name resolution" msgstr "Προσωρινή αποτυχία κατά την ανάλυση ονόματος" @@ -7421,7 +7449,7 @@ msgid "Test results" msgstr "Αποτελέσματα δοκιμής" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Δοκιμή δυνατότητας επαναφοράς του εξυπηρετητή" @@ -7449,25 +7477,25 @@ "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοιχτός σε ένα άλλο FileZilla 3.\n" "Παρακαλώ, κλείστε το διότι τα δεδομένα δε θα διαγραφούν." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Η διεύθυνση που εισάγατε ήταν: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Το μέλος ai_family δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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/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 "Οι σελιδοδείκτες ήταν αδύνατο να απομακρυνθούν." @@ -7493,17 +7521,17 @@ "Η προσαρμοσμένη μορφή ώρας δεν είναι έγκυρη ή δεν υποστηρίζονται τα " "προσδιοριστικά." -#: ../../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'." @@ -7515,7 +7543,7 @@ 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' υπάρχει ήδη στην λίστα" @@ -7531,7 +7559,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" @@ -7562,7 +7590,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" @@ -7572,7 +7600,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" @@ -7594,7 +7622,7 @@ "οδηγήσει σε απώλεια δεδομένων.\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" @@ -7643,7 +7671,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)" @@ -7666,17 +7694,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Το εύρος ορίου θα πρέπει να κυμαίνεται μεταξύ του 1 και των 2000 MiB" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Δεν ήταν δυνατή η δημιουργία του τοπικού καταλόγου '%s'." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." 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" @@ -7686,7 +7714,7 @@ "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του " "τοπικού φακέλου;" -#: ../../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." @@ -7702,16 +7730,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "Η νέα έκδοση έχει αποθηκευτεί στον κατάλογο λήψεων σας." -#: ../../locales/../src/interface/QueueView.cpp:1834 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "Η λίστα αναμονής δε μπόρεσε να αποθηκευτεί." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Το απομακρυσμένο κατάλογο '%s' δεν υπάρχει." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7754,11 +7782,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:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Ο εξυπηρετητής απέστειλε μία αναπάντεχη ή μη αναγνωρισμένη απάντηση." @@ -7795,7 +7823,7 @@ "Το κλειδί του κόμβου εξυπηρετητή είναι άγνωστο. Δεν υπάρχει εγγύηση ότι " "αυτός ο εξυπηρετητής είναι ο υπολογιστής που πιστεύετε ότι είναι." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Η παράμετρος servname δεν υποστηρίζεται από ai_socktype" @@ -7807,20 +7835,20 @@ "Οι ρυθμίσεις έχουν εισαχθεί. Επανεκκινήστε το FileZilla για να εκτελεστούν " "οι ρυθμίσεις." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Η συγκεκριμένη οικογένεια διευθύνσεων δεν υποστηρίζεται" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Το καθορισμένο όνομα δικτύου δεν είναι πλέον διαθέσιμο" -#: ../../locales/../src/interface/QueueView.cpp:3042 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Το σύστημα θα επανεκκίνηθεί, εκτός αν επιλέξετε να ακυρωθεί η ενέργεια αυτή." -#: ../../locales/../src/interface/QueueView.cpp:3038 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Το σύστημα θα τερματίσει την λειτουργία του, εκτός αν επιλέξετε Ακύρωση." @@ -7833,7 +7861,7 @@ "Το αρχείο προορισμού υπάρχει ήδη.\n" "Παρακαλώ, επιλέξτε μία ενέργεια." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" "Η δοκιμή απέτυχε. Είστε σίγουροι ότι θέλετε να αποθηκεύσετε τις ρυθμίσεις;" @@ -7847,15 +7875,15 @@ 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:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7880,7 +7908,7 @@ "τα τοίχοι προστασίας (firewalls) που μπορεί να έχετε και θα δοκιμάσει τις " "ρυθμίσεις σας." -#: ../../locales/../src/interface/queue.cpp:1169 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Ώρα" @@ -7893,27 +7921,27 @@ msgstr "Διακ&οπή σε δευτερόλεπτα:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Διακοπή" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Τίτλος:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Για να συγκρίνουν οι φάκελοι, οι δύο λίστες αρχείων πρέπει να " "ευθυγραμμιστούν." -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Για να γίνει αυτό, θα πρέπει και οι δύο δομές των φακέλων να είναι " @@ -7981,17 +8009,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 "Πολύ μεγάλη γραμμή κεφαλίδας" -#: ../../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 "Εντοπισμός:" @@ -8020,17 +8048,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:630 msgid "Transferred data got tainted." msgstr "Τα δεδομένα που μεταφέρθηκαν μολύνθηκαν." -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Μεταφορά" @@ -8039,8 +8067,8 @@ msgid "Transfers" msgstr "Μεταφορές" -#: ../../locales/../src/interface/QueueView.cpp:2940 -#: ../../locales/../src/interface/QueueView.cpp:2943 +#: ../../locales/../src/interface/QueueView.cpp:2944 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "Transfers finished" msgstr "Οι μεταφορές ολοκληρώθηκαν" @@ -8052,11 +8080,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Χειρισμός των &ακόλουθων τύπων αρχείων ως ASCII αρχεία:" -#: ../../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 "Νέο έμπιστο κλειδί κόμβου:" @@ -8094,7 +8122,7 @@ msgid "U&pload" msgstr "Α&ποστολή" -#: ../../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 "Όριο α&ποστολής:" @@ -8104,20 +8132,20 @@ msgstr "Χ&ρήση διαθέσιμων συσχετίσεων" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Χ&ρήση των προκαθορισμένων από το σύστημα" +msgid "U&se system defaults for current language" +msgstr "&Χρήση προεπιλογών συστήματος για την τρέχουσα γλώσσα" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "ΧΡΗΣΤΗΣ@&ΚΟΜΒΟΣ" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Απροσδιόριστος ο κωδικός σφάλματος %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Μονάδα:" @@ -8126,12 +8154,12 @@ msgid "Unknown" msgstr "Άγνωστο" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Άγνωστος τύπος διαμεσολαβητή FTP, δε μπορεί δημιουργηθεί ακολουθία σύνδεσης." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Άγνωστη έκδοση SOCKS πρωτοκόλλου: %d" @@ -8144,7 +8172,7 @@ msgid "Unknown host key" msgstr "Άγνωστο κλειδί κόμβου" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8160,8 +8188,8 @@ "Άγνωστο στοιχείο βάσης, το αρχείο αυτό δε φαίνεται να δημιουργήθηκε από το " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8169,7 +8197,7 @@ "Αν δεν επιδιορθωθούν αυτά τα προβλήματα, η ενεργητική κατάσταση FTP δε " "μπορεί να χρησιμοποιηθεί και θα χρησιμοποιηθεί η παθητική." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -8177,11 +8205,11 @@ "Αν δεν επιδιορθωθεί αυτό το πρόβλημα, η ενεργητική κατάσταση 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 "Μη υποστηριζόμενη αναδρομολογήση" @@ -8251,12 +8279,12 @@ msgid "Use &custom editor:" msgstr "Χρήση &προκαθορισμένου επεξεργαστή:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Χρήση &προκαθορισμένου επεξεργαστή για τα αρχεία κειμένου" #: ../../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 "Χρήση &συγχρονισμού περιήγησης" @@ -8284,8 +8312,8 @@ msgstr "Χρήση εξυπηρετητή από το διαχειριστή τοποθεσιών" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Χρήση των &προκαθορισμένων από το σύστημα" +msgid "Use system &defaults for current language" +msgstr "Χρήση &προεπιλογών συστήματος για την τρέχουσα γλώσσα" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8324,7 +8352,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 "Το όνομα χρήστη δε μπορεί να είναι μια σειρά κενών διαστημάτων" @@ -8350,7 +8378,7 @@ "Περιφραστικά μηνύματα καταγραφής από τα wxWidgets (γραφικά συστατικά μορφής " "wx)" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Επικύρωση πιστοποιητικού..." @@ -8358,7 +8386,7 @@ msgid "Very high" msgstr "Πολύ υψηλό" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "" "Προβολή κρυφών ενεργοποιήθηκε, αλλά δεν υποστηρίζεται από τον εξυπηρετητή" @@ -8375,15 +8403,15 @@ msgid "W&rite" msgstr "Ε&γγραφή" -#: ../../locales/../src/interface/QueueView.cpp:1672 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "Αναμονή" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Αναμονή για σύνδεση αναζήτησης" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Αναμονή για κωδικό πρόσβασης" @@ -8395,7 +8423,7 @@ msgid "Waiting to retry..." msgstr "Αναμονή για νέα προσπάθεια..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "" "Προειδοποίηση, αγνόηση δεδομένων σύνδεσης λόγω εσφαλμένης διεύθυνσης IP." @@ -8419,11 +8447,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 "Τι νέο υπάρχει" @@ -8431,7 +8459,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." @@ -8457,7 +8485,7 @@ 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 να απομνημονεύσει τον κωδικό πρόσβασης;" @@ -8465,20 +8493,20 @@ msgid "Wr&ite" msgstr "Εγ&γραφή" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Εσφαλμένη εξωτερική διεύθυνση IP" -#: ../../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:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8490,7 +8518,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 "" "Μπορείτε να ανοίξετε τον εν λόγω διάλογο επιλογών και μέσα από τη βοήθεια." @@ -8531,12 +8559,12 @@ 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?" @@ -8544,7 +8572,7 @@ "Έχετε επιλέξει περισσότερα από 10 αρχεία για επεξεργασία, θέλετε πραγματικά " "να συνεχιστείτε;" -#: ../../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?" @@ -8552,7 +8580,7 @@ "Έχετε επιλέξει περισσότερα από 10 αρχεία ή φακέλους για άνοιγμα, θέλετε " "πραγματικά να συνεχιστείτε;" -#: ../../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 "Πρέπει να καταχωρίσετε ένα όνομα κόμβου." @@ -8561,30 +8589,30 @@ msgid "You have to enter a key file path" 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." +#: ../../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:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8640,23 +8668,23 @@ "Πρέπει να εισαγάγετε μία τοπική και μία απομακρυσμένη διαδρομή, προκειμένου " "να ενεργοποιηθεί ο συγχρονισμός περιήγησης για αυτήν την τοποθεσία." -#: ../../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:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8664,7 +8692,7 @@ "Δεν πρέπει να έχετε προβλήματα σύνδεσης σε άλλους εξυπηρετητές, οι μεταφορές " "αρχείων πρέπει να λειτουργούν σωστά." -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Το σύστημα θα αναστείλει τη λειτουργία του, εκτός αν επιλέξετε Άκυρο." @@ -8689,7 +8717,7 @@ msgid "contains" msgstr "περιέχει" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "προσαρμοσμένη" @@ -8711,19 +8739,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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 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 " @@ -8733,15 +8761,15 @@ "Σιγουρευτείτε ότι το εκτελέσιμο αρχείο συνυπάρχει στον ίδιο φάκελο με το " "κύριο εκτελέσιμο αρχείο του FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of 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, δεν υπάρχουν πιστοποιητικά" @@ -8797,10 +8825,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: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 "άγνωστο" @@ -8821,6 +8849,32 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Connected" +#~ msgstr "Συνδεδεμένος" + +#~ msgid "Deleting directories" +#~ 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 "You have to enter a valid IP address." +#~ msgstr "Πρέπει να καταχωρίσετε μία έγκυση διεύθυνση IP." + +#~ msgid "U&se system defaults" +#~ msgstr "Χ&ρήση των προκαθορισμένων από το σύστημα" + +#~ msgid "Use system &defaults" +#~ msgstr "Χρήση των &προκαθορισμένων από το σύστημα" + #~ 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 " diff -Nru filezilla-3.14.1/locales/fi_FI.po filezilla-3.15.0.2/locales/fi_FI.po --- filezilla-3.14.1/locales/fi_FI.po 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/locales/fi_FI.po 2016-02-05 08:54:45.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: FileZilla Client 3.x.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:13+0200\n" -"PO-Revision-Date: 2015-10-05 16:52+0200\n" +"POT-Creation-Date: 2016-01-13 13:13+0100\n" +"PO-Revision-Date: 2015-11-12 20:00+0200\n" "Last-Translator: Kari Saariniemi \n" "Language-Team: Kari Saariniemi \n" "Language: fi_FI\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: iso-8859-1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.7\n" +"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 @@ -45,9 +45,9 @@ msgstr[0] "%d hakemisto" msgstr[1] "%d hakemistoa" -#: ../../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" @@ -56,9 +56,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" @@ -79,12 +79,12 @@ 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:2781 +#: ../../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:104 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -156,7 +156,7 @@ msgstr[0] "%s tavu" msgstr[1] "%s tavua" -#: ../../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 " @@ -169,7 +169,7 @@ "\n" "Lataa FileZilla uudestaan. Jos tämä ongelma toistuu, lähetä virheraportti." -#: ../../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 " @@ -200,7 +200,7 @@ msgid "%w - Proxy password" msgstr "%w - Välityspalvelimen salasana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Keskeytä edellinen yhteys ja yhdistä nykyisessä välilehdessä" @@ -253,13 +253,13 @@ msgid "&Always use default editor" msgstr "Käytä &aina oletusmuokkainta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 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 msgid "&Always use this action" -msgstr "&Käytä aina tätä toimintoa" +msgstr "Käytä &aina tätä toimintoa" #: ../../locales/../src/interface/resources/xrc/settings.xrc:341 msgid "&Ask your operating system for the external IP address" @@ -292,9 +292,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 @@ -307,8 +307,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" @@ -381,14 +381,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 "Po&ista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "Po&ista 'symlink'" @@ -396,13 +396,13 @@ msgid "&Directory comparison" msgstr "&Hakemistojen vertailu" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -428,7 +428,7 @@ msgid "&Display size in bytes" msgstr "&Näytä koko tavuina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Ä&lä muista salasanoja (suositeltu)" @@ -449,7 +449,7 @@ msgid "&Download" msgstr "&Lataa palvelimelta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Lataa kohteeseen:" @@ -482,7 +482,7 @@ msgid "&Enable compression" msgstr "&Ota pakkaus käyttöön" -#: ../../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 "&Ota nopeusrajoitukset käyttöön" @@ -499,7 +499,7 @@ msgid "&Enter custom command..." msgstr "&Anna oma komento..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "M&uodosta yhteys uuteen välilehteen" @@ -552,7 +552,7 @@ msgid "&Finish editing and delete local file" msgstr "&Lopeta muokkaus ja poista paikallinen tiedosto" -#: ../../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" @@ -560,7 +560,7 @@ "&Tiivistä palvelimen polut, lataa kaikki niihin sisältyvät tiedostot samaan " "kohdehakemistoon" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Seuraa 'symlinkkiä', poista kohdehakemiston sisältö" @@ -623,7 +623,7 @@ msgid "&Install new version" msgstr "&Asenna uusi versio" -#: ../../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 "&Säilytä etäpolun rakenne suhteessa hakujuureen" @@ -648,7 +648,7 @@ msgstr "Paikallinen hak&emistopuu" #: ../../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 "&Paikallinen hakemisto:" @@ -712,7 +712,7 @@ msgid "&New Site" msgstr "&Uusi sivusto" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Lataa uusin versio!" @@ -739,7 +739,7 @@ msgstr "&Numeerinen arvo:" #: ../../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 "&OK" @@ -755,7 +755,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" -msgstr "K&orvaa" +msgstr "Ko&rvaa" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" @@ -773,7 +773,7 @@ #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:74 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:107 msgid "&Port:" -msgstr "Po&rtti:" +msgstr "&Portti:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" @@ -816,12 +816,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Muista salasana kunnes FileZilla suljetaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "P&alvelimen hakemisto:" @@ -842,7 +842,7 @@ msgstr "Poista &valitut" #: ../../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 @@ -903,7 +903,7 @@ msgid "&Save as..." msgstr "Tallenna &nimellä..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Etsi" @@ -972,7 +972,7 @@ msgid "&Speed limits" msgstr "&Nopeusrajoitukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Aloita siirto &heti" @@ -984,7 +984,7 @@ msgid "&TLS Ciphers" msgstr "&TLS -salaukset" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Testaa" @@ -1027,7 +1027,7 @@ msgid "&Uploads:" msgstr "&Lataukset palvelimelle:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Käytä erillistä ohjelmaa" @@ -1059,9 +1059,9 @@ #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:44 msgid "&Username:" -msgstr "Kä&yttäjänimi:" +msgstr "&Käyttäjänimi:" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Versio %s" @@ -1107,12 +1107,12 @@ msgid "'%s' is not a directory." msgstr "'%s' ei ole hakemisto." -#: ../../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 "'Tili' -kirjautumistyyppiä ei tueta valitussa protokollassa" -#: ../../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." @@ -1128,7 +1128,7 @@ "'Normaali' ja 'Tili' -kirjautumistyypit eivät ole enää saatavilla. Syöte on " "muutettu muotoon 'Kysy salasanaa'." -#: ../../locales/../src/interface/Mainfrm.cpp:587 +#: ../../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 " @@ -1186,8 +1186,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(esimerkki: %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 @@ -1265,7 +1265,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Hakemistoa ei voi vetää sen alikansioihin." @@ -1294,7 +1294,7 @@ "Tällä nimellä oleva tiedosto on vielä muokattavana. Sulje se ja yritä " "uudestaan." -#: ../../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 " @@ -1311,7 +1311,7 @@ msgid "A new version of FileZilla is available:" msgstr "FileZillasta on saatavilla uusi versio:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../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." @@ -1328,7 +1328,7 @@ "Kelvollinen palvelin ei tarvitse tätä. Jos tarvitset tätä, ota yhteyttä " "palvelimen ylläpitäjään." -#: ../../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?" @@ -1357,7 +1357,7 @@ #: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" -msgstr "Käy&tä vain ladattaessa palvelimelle" +msgstr "Käytä &vain ladattaessa palvelimelle" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 msgid "A&pply to all files and directories" @@ -1381,11 +1381,11 @@ #: ../../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: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" @@ -1411,7 +1411,7 @@ msgid "Active mode" msgstr "Aktiivitila" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1419,7 +1419,7 @@ "Aktiivitilan FTP-testi epäonnistui. FileZilla ei tiedä oikeaa ulkoista IP-" "osoitetta." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../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." @@ -1427,7 +1427,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:596 +#: ../../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 " @@ -1441,7 +1441,7 @@ msgid "Active mode IP" msgstr "Aktiivitilan IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Lisää tiedostot vain j&onoon" @@ -1460,7 +1460,7 @@ msgid "Add to queue" msgstr "Lisää jonoon" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Osoitetyyppiä ei tueta" @@ -1482,7 +1482,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Suorita aina tämä toiminto" @@ -1490,7 +1490,7 @@ msgid "Algorithm:" msgstr "Algoritmi:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Kaikki tiedostot siirretty onnistuneesti" @@ -1499,7 +1499,7 @@ msgstr "" "Kaikki annetulla alueella olevien porttien tulee olla välillä 1024 ja 65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1514,7 +1514,7 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Salli vaihto toiseen siirtotapaan virheen sattuessa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Jo yhdistetty" @@ -1547,7 +1547,7 @@ msgstr "" "Voit myös vaihtoehtoisesti ladata uusimman version FileZillan sivustolta:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1556,7 +1556,7 @@ "Tapahtui virhe ladattaessa siirtojonoa kohteesta \"%s\".\n" "Joitakin jonon kohteita ei ehkä ole palautettu." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1565,23 +1565,23 @@ "Tapahtui virhe tallennettaessa siirtojonoa kohteesta \"%s\".\n" "Joitakin jonon kohteita ei ehkä ole tallennettu." -#: ../../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 "Kohteessa on jo samalla nimellä oleva tiedosto." #: ../../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/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 "Anonyymi" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1591,11 +1591,11 @@ msgid "Any changes made in the Site Manager could not be saved." msgstr "Sivustonhallintaan tehtyjä muutoksia ei voitu tallentaa." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "Suodattimiin tehtyjä muutoksia ei voitu tallentaa." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Mitään suodattimien muutoksia ei tallenneta." @@ -1619,7 +1619,7 @@ msgid "Archive" msgstr "Arkisto" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Argumenttipuskurin ylivuoto" @@ -1637,7 +1637,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Kysy salasanaa" @@ -1649,7 +1649,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Kysymysten teko FileZillan foorumeissa" @@ -1669,7 +1669,7 @@ msgid "Attribute" msgstr "Määrite" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Todennus epäonnistui." @@ -1698,11 +1698,11 @@ msgid "B&ypass proxy" msgstr "Ohita välityspalvelin" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Virheellinen tiedoston deskriptori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Peruskäytön ohjeet" @@ -1715,7 +1715,7 @@ msgid "Being edited" msgstr "Muokattavana" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Varoitus! Sertifikaatti mitätöity" @@ -1733,11 +1733,11 @@ msgid "Bookmark" msgstr "Kirjanmerkki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Kirjanmerkki:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Kirjanmerkit" @@ -1792,8 +1792,8 @@ msgid "CPU features:" msgstr "CPU:n ominaisuudet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Lasketaan palvelimen aikavyöhykkeen siirtymää..." @@ -1825,13 +1825,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 "Peruuta" @@ -1850,11 +1850,11 @@ msgstr "" "Ei saada yhteyttä kohteeseen '%s', mediaa ei annettu tai asema ei valmis." -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Palvelinta ei voi lisätä Sivustonhallintaan" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Pyydettyä osoitetta ei voi asettaa" @@ -1880,20 +1880,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 "Tiedostoa ei voi muokata" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Tiedostoa ei voi muokata, ei yhdistetty mihinkään palvelimeen." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Tiedostoa ei voi muokata, palvelimen polku tuntematon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1910,11 +1910,11 @@ msgid "Cannot load key file" msgstr "Avaintiedostoa ei voi avata" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Ei voitu ladata työkaluriviä resurssitiedostosta" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Salasanaa ei muisteta" @@ -1923,22 +1923,22 @@ msgid "Cannot rename entry" msgstr "Kohdetta ei voitu nimetä uudelleen." -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Tiedostoa ei voitu nimetä uudelleen" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Suodatinjoukkoa ei voi tallentaa" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Suodattimen valinta ei onnistu" @@ -2006,7 +2006,7 @@ msgstr "" "FileZilla pitää käynnistää uudelleen, kun muutetaan lokitiedoston asetuksia." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Merkin koodausselvitys" @@ -2034,7 +2034,7 @@ msgid "Check for updates failed" msgstr "Päivitystarkistus epäonnistui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2042,7 +2042,7 @@ "Tarkista sisäänkirjautumisesi valtuudet. Annettu salasana alkaa tai loppuu " "tyhjään merkkiin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2050,7 +2050,7 @@ "Tarkista sisäänkirjautumisesi valtuudet. Annettu käyttäjänimi alkaa tai " "loppuu tyhjään merkkiin." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Etsitään kelvollista ulkoista IP-osoitetta" @@ -2058,12 +2058,12 @@ msgid "Checking for updates..." msgstr "Etsitään päivityksiä..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Tiedoston %s tarkistussumma\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Tiedoston %s tarkistussumma ei täsmää\n" @@ -2078,11 +2078,11 @@ #: ../../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 "Valitse paikallinen hakemisto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Datalohko lopetettu virheellisesti" @@ -2120,7 +2120,7 @@ msgid "Clear quickconnect bar" msgstr "Tyhjennä pikayhdistämispalkki" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Klikkaa Lopeta tallentaaksesi määrityksen." @@ -2137,8 +2137,8 @@ msgstr "Sulje &kaikki muut välilehdet" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Sulje FileZilla" @@ -2166,13 +2166,13 @@ msgid "Command and its arguments should be properly quoted." msgstr "Komento ja sen argumentit pitää antaa oikeaoppisesti." -#: ../../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 "Komento epäonnistui" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Komento ei ole tuettu" @@ -2180,7 +2180,7 @@ msgid "Command not supported by this protocol" msgstr "Tämä protokolla ei tue komentoa" -#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/engine/logging.cpp:112 #: ../../locales/../src/interface/StatusView.cpp:283 #: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" @@ -2194,8 +2194,8 @@ msgid "Common name:" msgstr "Yhteinen nimi:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Reititin tai palomuuri hylkäsi yhteyden" @@ -2242,7 +2242,7 @@ msgstr "Samanaikaiset siirrot" #: ../../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 "&Merkkiherkät ehdot" @@ -2258,24 +2258,24 @@ msgid "Configure port range" msgstr "Määritä porttialue" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "FileZillan ja verkon määritys" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Vahvista poisto" -#: ../../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 "Tarvitaan vahvistus" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Onnittelut, määritys näyttää toimivan." @@ -2283,6 +2283,11 @@ msgid "Connect bypassing proxy settings" msgstr "Yhdistä ohittaen palvelimen asetukset" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Välityspalvelimen pyyntö epäonnistui: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Yhdistä nykyiseen välilehteen" @@ -2295,29 +2300,29 @@ msgid "Connect to specified Site Manager site" msgstr "Yhdistä määritettyyn Sivustonhallinnan sivustoon" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "Yhdistetty" -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Yhdistetään" -#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Yhdistetään kohteeseen %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Yhdistetään kohteeseen %s välityspalvelimen %s kautta" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../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 "Yhdistetään kohteeseen %s..." @@ -2326,120 +2331,125 @@ msgid "Connection" msgstr "Yhteys" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" -msgstr "Yhteys kekseytetty" +msgstr "Yhteys keskeytetty" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Yhteysyritys epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:927 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Yhteysyritys epäonnistui osoitteeseen \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../locales/../src/engine/ControlSocket.cpp:185 #: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Käyttäjä keskeytti yhteysyrityksen" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Yhteysyrityksen aikakatkaisu" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Yhteys suljettu" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Palvelin sulki yhteyden" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Yhteys muodostettu, alustetaan TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Yhteys muodostettu, lähetetään HTTP-pyyntö" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Yhteys menetetty" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Sääntöasetukset eivät salli yhteyttä" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Yhteys evättiin" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Palvelin eväsi yhteyden" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Verkko resetoi yhteyden" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "'peer' resetoi yhteyden" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../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] "Yhteyden aikakatkaistu, koska yhteys oli toimimattomana %d sekuntia" msgstr[1] "Yhteyden aikakatkaistu, koska yhteys oli toimimattomana %d sekuntia" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Yhteys aikakatkaistu." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Yhteys palvelimelle katkesi." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Yhteys välityspalvelimeen muodostettu, suoritetaan kättely..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Yhteys palvelimeen suljettiin ennenaikaisesti." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Yhteys testipalvelimeen epäonnistui." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Muunna avaintiedosto" #: ../../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 "Kopio (%d) kohteesta %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 "Kopio kohteesta %s" @@ -2459,30 +2469,30 @@ msgid "Could not add connection to Site Manager" msgstr "Ei voitu lisätä yhteyttä Sivustonhallintaan" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Toiminnon suorittaminen epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Yhteys palvelimeen epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Yhteyttä ei voitu muodostaa palvelimeen: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Ei voitu muuntaa komentoa palvelimen koodaukselle" -#: ../../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 "Salattua avainta ei voitu muuntaa" -#: ../../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 "URL:ien kopiointi epäonnistui" @@ -2490,17 +2500,17 @@ msgid "Could not copy data" msgstr "Datan kopiointi epäonnistui" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Paikallisen tiedoston %s luonti epäonnistui\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Kirjautumis-mutexia ei voitu luoda: %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" @@ -2511,11 +2521,11 @@ "Joko valikon laajennusta ei ole asennettu oikein tai et pudottanut " "tiedostoja Resurssienhallinnan ikkunaan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Palvelimeen ei saatu yhteyttä" -#: ../../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 " @@ -2526,11 +2536,11 @@ "Voit asettaa FileZillan datahakemiston käyttäen '--datadir ' " "komentorivin valintaa tai asettamalla FZ_DATADIR -ympäristömuuttujan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Muokattua kirjautumisaluetta ei voitu luoda." -#: ../../locales/../src/engine/tlssocket.cpp:934 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2538,7 +2548,7 @@ "Ei saatu kuvaavaa nimeä sertifikaatin julkaisijalta, " "gnutls_x509_get_issuer_dn epäonnistui" -#: ../../locales/../src/engine/tlssocket.cpp:911 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2546,26 +2556,31 @@ "Ei saatu kuvaavaa nimeä sertifikaatin aiheesta, gnutls_x509_get_dn " "epäonnistui" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Ei saatu palvelimen koko polkua." -#: ../../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:iltä ei saatu vastausta." #: ../../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 "Latauksien väliaikaishakemistoa ei löytynyt." -#: ../../locales/../src/engine/tlssocket.cpp:857 +#: ../../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/engine/tlssocket.cpp:852 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, fuzzy, 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" @@ -2589,11 +2604,11 @@ msgid "Could not load key file" msgstr "Avaintiedostoa ei voitu avata" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Salattua avainta ei voitu avata" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2605,7 +2620,7 @@ "Poistetaanko synkronoitu selaus käytöstä ja jatketaan palvelinhakemiston " "vaihtamista?" -#: ../../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 " @@ -2616,7 +2631,7 @@ "'%s'.\n" "Synkronoitu selaus poistettu käytöstä." -#: ../../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 " @@ -2628,14 +2643,14 @@ "Synkronoitu selaus poistettu käytöstä." #: ../../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 "Leikepöydän avaaminen epäonnistui" -#: ../../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 "Ei voitu avata lokitiedostoa: %s" @@ -2648,7 +2663,12 @@ msgid "Could not parse server address:" msgstr "Ei voitu jäsentää palvelimen osoitetta:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Ei voitu lukea socket-rajapinnasta: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Ei voitu lukea socket-rajapinnasta: %s" @@ -2657,29 +2677,34 @@ msgid "Could not read server item." msgstr "Palvelinosiota ei voitu lukea." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Yhteys palvelimeen epäonnistui" + +#: ../../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/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Ei voitu etsiä tiedoston loppuun" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Komennon lähettäminen fzputtygen:ille epäonnistui." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "IO-solmua ei voitu muodostaa" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Ei voitu aloittaa välityspalvelimen kättelyä: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Siirtoa ei voitu aloittaa" @@ -2704,7 +2729,7 @@ msgstr "" "Ei voitu kirjoittaa \"%s\", globaaleja kirjanmerkkejä ei voitu tallentaa: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2715,7 +2740,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:720 #: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, 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" @@ -2725,23 +2750,23 @@ msgid "Could not write \"%s\":" msgstr "Ei voitu kirjoittaa \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Ei voitu kirjoittaa avaintiedostoa: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Ei voitu kirjoittaa paikalliseen tiedostoon" -#: ../../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 "Ei voitu kirjoittaa lokitiedostoon: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Ei voitu kirjoittaa socket-rajapintaan: %s" @@ -2754,11 +2779,11 @@ msgid "Crea&te new file" msgstr "&Luo uusi tiedosto" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Luo puuttuva paikallinen &hakemisto ja siirry siihen" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Luo puuttuva &etähakemisto ja siirry siihen" @@ -2787,45 +2812,45 @@ msgid "Create director&y and enter it" msgstr "Luo &hakemisto ja siirry siihen" -#: ../../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 "Luo hakemisto" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Luo tyhjä tiedosto" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Luodaan hakemisto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Luodaan hakemisto '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kriittinen virhe" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kriittinen virhe:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kriittinen tiedostonsiirron virhe" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, 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:352 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2855,7 +2880,7 @@ msgid "Cus&tom" msgstr "&Muokattu" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Muokattu suodatinjoukko" @@ -2883,6 +2908,10 @@ msgid "D&elete" msgstr "Po&ista" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "H&akemistojen vertailu" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Poista k&aikki käytöstä" @@ -2896,7 +2925,7 @@ msgstr "Hakemistojen &kaksoisklikkauksen toiminta:" #: ../../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 "M&onista" @@ -2912,8 +2941,8 @@ msgid "Data" msgstr "Tiedot" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Datan socket-rajapinta suljettu liian aikaisin." @@ -3034,19 +3063,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Poistetaan %u -tiedostoa kohteesta \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Poistetaan hakemistoja" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Usean kuulumattoman hakemiston poistaminen ei ole vielä tuettu" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Poistetaan symbolinen linkki" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Työpöytä" @@ -3068,7 +3089,7 @@ msgid "Dire&ctories" msgstr "&Hakemistot" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Suunta" @@ -3076,13 +3097,13 @@ msgid "Directory" msgstr "Hakemisto" -#: ../../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:2165 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Hakemistojen vertailu" @@ -3094,11 +3115,11 @@ 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:190 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Hakemistolistaus käyttäjän keskeyttämä" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Hakemistolistaus epäonnistui" @@ -3106,12 +3127,12 @@ msgid "Directory listing filters" msgstr "Tiedostonimen suodattimet" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Kohteen \"%s\" hakemistolistaus onnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Hakemistolistaus onnistui" @@ -3119,14 +3140,14 @@ msgid "Disa&ble all" msgstr "P&oista kaikki käytöstä" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:649 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3136,23 +3157,23 @@ msgid "Disconnect from server" msgstr "Katkaise yhteys palvelimeen" -#: ../../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: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 "Yhteys palvelimeen katkaistu" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../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 "Yhteys katkaistu palvelimeen: %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 "Katkaistaan yhteys edelliseltä palvelimelta" @@ -3179,8 +3200,8 @@ msgstr "" "Tee sama &kaikille valittuina oleville tiedostoille, jotka on jo muokattu" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Suljetaanko FileZilla?" @@ -3201,7 +3222,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Poistetaanko siirtojono?" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Lähetetäänkö '%s' palvelimelle?" @@ -3210,7 +3231,7 @@ msgid "Do you want to reopen this file?" msgstr "Avataanko tämä tiedosto uudestaan?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentaatio" @@ -3231,7 +3252,7 @@ msgid "Download" msgstr "Lataa palvelimelta" -#: ../../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 "Lataus&rajoitus palvelimelta:" @@ -3245,9 +3266,9 @@ msgid "Download limit: none" msgstr "Latausrajoitus: Ei mitään" -#: ../../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 "Lataa hakutulokset" @@ -3259,7 +3280,7 @@ msgid "Download selected files and directories" msgstr "Lataa valitut tiedostot ja hakemistot" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3272,26 +3293,18 @@ msgid "Downloading" msgstr "Ladataan" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Ladataan %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Usean kuulumattoman hakemiston lataaminen ei ole vielä tuettu" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Ladataan hakutulokset" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Ladataan päivitystä..." -#: ../../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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3301,9 +3314,9 @@ "Vedä&Pudota -toimintoa ei ole vielä otettu käyttöön FileZillan eri " "instanssien välillä." -#: ../../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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3355,16 +3368,16 @@ msgstr "" "Muokkaa tiedostoa määritetyllä muokkaimella ja lataa muutokset palvelimelle." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Hakemistojen muokkausta ei vielä tueta" -#: ../../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 "Muokkaus epäonnistui" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Muokataan hakutuloksia" @@ -3372,7 +3385,7 @@ msgid "Email:" msgstr "Sähköposti:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Tyhjä komento." @@ -3380,7 +3393,7 @@ msgid "Empty command." msgstr "Tyhjä komento." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Tyhjä hakemistolistaus" @@ -3388,6 +3401,12 @@ 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." @@ -3426,7 +3445,7 @@ msgid "Encryption details" msgstr "Salauksen tiedot" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Lopetetaanko vertailu ja muutetaan lajittelujärjestystä?" @@ -3434,15 +3453,15 @@ msgid "Enter &custom command..." msgstr "&Anna oma komento..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Anna 0 rajattomalle nopeudelle." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Anna komento" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Anna oma komento" @@ -3456,11 +3475,11 @@ msgid "Enter filter name" msgstr "Anna suodattimen nimi" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Suodatinjoukon nimi" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Anna uusi nimi suodatinjoukolle" @@ -3501,7 +3520,7 @@ "-ftps:// FTP-TLS (implisiittinen)\n" "-ftpes:// FTP-TLS (eksplisiittinen)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3531,7 +3550,7 @@ msgid "Error importing" msgstr "Tuonti epäonnistui" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "Virhe ladattaessa jonoa" @@ -3540,14 +3559,14 @@ #: ../../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/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 @@ -3556,32 +3575,32 @@ #: ../../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:939 msgid "Error loading xml file" msgstr "XML-tiedoston lataus epäonnistui" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" msgstr "Virhe tallennettaessa jonoa" -#: ../../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 "Virhe ohjelman käynnistyksessä" #: ../../locales/../src/interface/bookmarks_dialog.cpp:318 #: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 +#: ../../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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "XML-tiedoston kirjoitus epäonnistui" -#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/engine/logging.cpp:111 #: ../../locales/../src/interface/StatusView.cpp:281 #: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" @@ -3673,24 +3692,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP:n implisiittinen TLS-suojaus" -#: ../../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 "Hakemiston vaihtaminen ei onnistunut" -#: ../../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 "Kielen vaihtaminen ei onnistunut" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Sivustojen kopiointi tai siirto epäonnistui" @@ -3698,28 +3717,28 @@ msgid "Failed to create backup copy of xml file" msgstr "XML-tiedoston varmuuskopion luonti epäonnistui" -#: ../../locales/../src/interface/netconfwizard.cpp:803 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui, keskeytetään" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui aktiivitilan siirrolle" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "'Omat tiedostot' -polkua ei löytynyt" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Työpöydän polkua ei löytynyt" -#: ../../locales/../src/interface/netconfwizard.cpp:961 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:968 +#: ../../locales/../src/interface/netconfwizard.cpp:951 msgid "Failed to get peer address of data connection, connection closed." msgstr "Datayhteyden 'peer'-osoitteen haku epäonnistui, yhteys suljettu." @@ -3727,82 +3746,87 @@ msgid "Failed to initialize FTP engine" msgstr "FTP-koneiston alustus epäonnistui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "TLS:n alustus epäonnistui." +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "FTP-koneiston alustus epäonnistui" + #: ../../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:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Salatun avaimen lataaminen epäonnistui: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, 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:2558 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Ei voitu avata kohdetta \"%s\" lukemista varten" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Ei voitu avata kohdetta \"%s\" kirjoittamista varten" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Palautettua polkua ei voitu jäsentää." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Datan vastaanotto epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Hakemistolistauksen haku epäonnistui" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../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/engine/ftpcontrolsocket.cpp:3785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "" "Ulkoisen IP-osoitteen haku epäonnistui, käytetään paikallista osoitetta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 +#: ../../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:707 +#: ../../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/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Ulkoisen IP-osoitteen haku epäonnistui." -#: ../../locales/../src/interface/netconfwizard.cpp:323 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Komennon lähetys epäonnistui." -#: ../../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 "" "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä" -#: ../../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)." @@ -3810,28 +3834,28 @@ "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä (%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 "" "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän " "oletuskieltä." -#: ../../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 "" "Kielen asetus kielelle %s epäonnistui, käytetään järjestelmän oletuskieltä" -#: ../../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 "" "Kielen asetus kielelle %s epäonnistui, käytetään järjestelmän oletuskieltä " "(%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 "" @@ -3841,11 +3865,11 @@ msgid "Failed to validate settings" msgstr "Asetuksien varmennus epäonnistui" -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "'Peer'-sertifikaatin todennus epäonnistui" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Tiedostoon %s kirjoittaminen epäonnistui" @@ -3878,7 +3902,7 @@ msgid "File Types" msgstr "Tiedostotyypit" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Tiedoston deskriptori ei ole socket-rajapinta" @@ -3890,7 +3914,7 @@ msgid "File editing" msgstr "Tiedoston muokkaus" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Tiedosto on jo olemassa" @@ -3907,8 +3931,8 @@ msgstr "Tiedostolistaukset" #: ../../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 "Tiedostoa ei löydy" @@ -3917,38 +3941,38 @@ msgid "File search" msgstr "Tiedoston haku" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Tiedostonsiirto käyttäjän keskeyttämä" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, 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:136 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Tiedostonsiirto epäonnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "Tiedostonsiirto epäonnistui siirrettäessä %s %s" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Tiedostonsiirto ohitettu" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Tiedostonsiirto onnistui" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Tiedostonsiirto onnistui, siirretty %s/%s" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Tiedostosiirrot vielä käynnissä." @@ -3960,7 +3984,7 @@ msgid "File would transfer with binary data type." msgstr "Tiedosto siirrettäisiin binääritietotyyppinä." -#: ../../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" @@ -3974,11 +3998,11 @@ "FileZilla voi nyt testata määrityksen varmistaakseen, että kaikki on " "määritetty oikein." -#: ../../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 on jo yhdistetty palvelimeen." -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla pitää käynnistää uudelleen, jotta kieliasetukset tulevat voimaan." @@ -3993,7 +4017,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 @@ -4004,13 +4028,13 @@ msgid "Filename &filters..." msgstr "Tiedostonimen &suodattimet..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../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 "Tiedostonimeä ei voi muodostaa hakemistoon %s ja tiedostonimelle %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Epäkelpo tiedostonimi" @@ -4041,7 +4065,7 @@ msgstr "Tiedostot, joita parhaillaan muokataan" #: ../../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" @@ -4051,7 +4075,7 @@ msgid "Filesize format" msgstr "Tiedostokoon muoto" -#: ../../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" @@ -4089,8 +4113,8 @@ 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: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 "Suodatinjoukko on jo olemassa" @@ -4104,11 +4128,11 @@ msgid "Filter validation failed" msgstr "Suodattimen varmennus epäonnistui" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Etsi &tiedostoja" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Etsi &hakemistoja" @@ -4125,7 +4149,7 @@ msgid "Fingerprint:" msgstr "Sormenjälki:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Palomuurin ja reitittimen määritysvelho" @@ -4157,7 +4181,7 @@ msgid "Force showing &hidden files" msgstr "&Pakota piilotettujen tiedostojen näyttäminen" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Pakota piilotettujen tiedostojen näyttäminen" @@ -4172,12 +4196,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Löytyi uusi %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Lisädokumentit" @@ -4185,7 +4209,7 @@ msgid "General" msgstr "Yleiset" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Yleinen SOCKS-palvelimen vika" @@ -4198,12 +4222,12 @@ msgid "Get external IP address from the following URL:" msgstr "Hae ulkoinen IP-osoite seuraavasta URL:stä:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Ohjeet" -#: ../../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 "" "Annetun suodatinjoukon nimi on jo olemassa, korvataanko suodatinjoukko?" @@ -4212,22 +4236,22 @@ msgid "Global bookmarks" msgstr "Globaalit kirjanmerkit" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS -virhe %d" -#: ../../locales/../src/engine/tlssocket.cpp:190 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS -virhe %d kohteessa %s" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS -virhe %d kohteessa %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS -virhe %d: %s" @@ -4257,17 +4281,17 @@ msgstr "Piilotettu" #: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Suuri" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Suurin" -#: ../../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 "" "Suurin käytettävissä olevan portin numero pitää olla väliltä 1024 ja 65535." @@ -4283,7 +4307,7 @@ msgid "Homepage:" msgstr "Kotisivu:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Isäntäkone ei vastaa" @@ -4299,7 +4323,7 @@ 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:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Isäntään ei saatu yhteyttä" @@ -4318,7 +4342,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esimerkki: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 -välityspalvelimen IPv6 -osoitteita ei tueta" @@ -4363,7 +4387,7 @@ msgstr "" "Jos isäntäavaimen vaihtoa ei odotettu, ota yhteyttä palvelimen ylläpitääjään." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4371,7 +4395,7 @@ "Jos tämä ongelma jatkuu, jokin reititin ja/tai palomuuri jatkaa FileZillan " "estämistä." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4389,7 +4413,7 @@ "\".1\" tiedostonimen loppuun (korvaten mahdollisesti vanhemmat " "lokitiedostot) ja uusi tiedosto luodaan." -#: ../../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." @@ -4397,7 +4421,7 @@ "Jos 'symlink' viittaa hakemistoon, FileZilla voi joko poistaa symbolisen " "linkin tai tyhjentää linkitetyn hakemiston sisällön." -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4405,7 +4429,7 @@ "Jos tämä ongelma ei poistu, ota yhteyttä reitittimesi tai palomuurin " "valmistajaan ja kysy neuvoa." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "Jos tämä ongelma ei poistu, ota yhteyttä reitittimesi valmistajaan." @@ -4440,7 +4464,7 @@ "Jos klikkaat Testaa, FileZilla yhdistää osoitteeseen: probe.filezilla-" "project.org ja suorittaa muutaman yksinkertaisen testin." -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Jos suljet FileZillan, muutoksesi menetetään." @@ -4464,7 +4488,7 @@ "Jos hakemistolistauksen hakemisessa tai siirrettäessä tiedostoja tulee " "ongelmia, yritä vaihtaa oletuksena olevaa siirtotapaa." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -4499,7 +4523,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:611 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4559,7 +4583,7 @@ "palvelimelta porttia ja yhdistää annettuun porttiin. Tätä ei tarvitse " "paljonkaan määrittää." -#: ../../locales/../src/engine/tlssocket.cpp:1095 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4567,7 +4591,7 @@ "Puutteellinen ketju, pääsertifikaatti ei ole itse allekirjoitettu " "valtuutetun sertifikaatti" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Salasana ei kelpaa" @@ -4579,22 +4603,21 @@ "FileZillan uusimman version tietojen lataus epäonnistui. Yritä uudestaan " "myöhemmin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Alustetaan TLS..." #: ../../locales/../src/interface/verifycertdialog.cpp:107 -#, fuzzy msgid "Insecure algorithm!" -msgstr "Allekirjoituksen algoritmi:" +msgstr "Turvaton algoritmi!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiivinen" @@ -4602,29 +4625,29 @@ msgid "Interface" msgstr "Käyttöliittymä" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Signaalin keskeytys" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Käyttäjän keskeytys" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Content-Length ei kelpaa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "HTTP-vastaus ei kelpaa" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Annettiin virheellinen argumentti" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../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." @@ -4632,13 +4655,14 @@ "Vastaanotettiin epäkelpo merkistösekvenssi, poistetaan UTF-8. Valitse UTF-8 " "Sivustonhallinnassa pakottaaksesi UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Alilohkon koko ei kelpaa" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../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 "Vastaanotettu data ei kelpaa" @@ -4683,22 +4707,22 @@ "ftps:// FTP-TLS (implisiittinen) ja\n" "ftpes:// FTP-TLS (eksplisiittinen)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Epäkelpo säännöllinen lauseke hakuehdoissa." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Vastauskoodi ei kelpaa" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Epäkelvot hakuehdot: %s" @@ -4726,11 +4750,11 @@ msgid "Invalid username given." msgstr "Käyttäjänimi ei kelpaa." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Epäkelpo arvo ai_flags'ille" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Virheellinen arvo vihjeille" @@ -4750,7 +4774,7 @@ msgid "Keep directories on top" msgstr "Pidä hakemistot päällimmäisinä" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../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 " @@ -4785,11 +4809,11 @@ msgid "Language" msgstr "Kieli" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Kieli vaihdettu" -#: ../../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" @@ -4819,7 +4843,7 @@ msgid "Limit:" msgstr "Raja:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Rivin pituus ylitetty" @@ -4827,11 +4851,12 @@ msgid "Linked against" msgstr "Linkitetty vastaan" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Kuuntelun socket-rajapinta suljettu" -#: ../../locales/../src/engine/logging.cpp:117 +#: ../../locales/../src/engine/logging.cpp:118 #: ../../locales/../src/interface/StatusView.cpp:292 #: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" @@ -4846,11 +4871,11 @@ msgid "Local" msgstr "Paikallinen kansio" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Paikallinen osoite käytössä" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Paikallinen päätepiste suljettu" @@ -4858,21 +4883,21 @@ msgid "Local file" msgstr "Paikallinen tiedosto" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Paikallinen tiedosto ei ole olemassa." -#: ../../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 "Paikallinen tiedosto on %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 "Paikallinen tiedosto on hakemisto eikä tavallinen tiedosto." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Paikallinen tiedosto ei ole kelvollinen tiedostonimi." @@ -4897,7 +4922,7 @@ msgid "Logging" msgstr "Kirjautuminen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../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." @@ -4906,7 +4931,7 @@ "UTF-8:aa. Ei voi palata paikalliseen merkistöön, koska käytetään " "välityspalvelinta." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4914,7 +4939,7 @@ "Kirjautumistiedot eivät sisällä ASCII-merkkejä, palvelin ei ehkä ymmärrä " "UTF-8:aa. Kokeillaan paikallista merkistöä." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../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." @@ -4933,17 +4958,17 @@ "Kirjautumistyyppiä voidaan käyttää ainoastaan FTP URL:n kanssa. Argumentin " "on oltava joko '%s' tai '%s'" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Pieni" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Pienin" -#: ../../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 "Pienin käytössä olevan portin pitää olla väliltä 1024 ja 65535." @@ -4957,46 +4982,46 @@ "Varmista, että tiedoston voi avata ja että se on oikein muotoiltu XML-" "asiakirja." -#: ../../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 "Virheellisesti muotoiltu paladata: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Virheellisesti muotoiltu tunniste: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Manuaalinen siirto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Täsmää kaikkiin seuraaviin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Täsmää kaikkiin seuraaviin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Älä täsmää seuraaviin" @@ -5004,12 +5029,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Samanaikaisten s&iirtojen enimmäismäärä:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Muistin varaaminen epäonnistui" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Sanomaloki" @@ -5017,7 +5042,7 @@ msgid "Message log position" msgstr "Sanomalokin sijainti" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Sanoma liian suuri" @@ -5037,11 +5062,11 @@ msgid "Move &up" msgstr "Siirrä &ylöspäin" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Oma tietokone" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Omat tiedostot" @@ -5082,7 +5107,7 @@ msgid "Need to enter filter name" msgstr "Suodatinnimi tarvitaan" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Kelvollinen polku tarvitaan" @@ -5090,18 +5115,18 @@ msgid "Need to specify a character encoding" msgstr "Merkistökoodaus tarvitaan" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Sekä 'nodename', että 'servname' ei annettu tai ei tunneta" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Verkkoon ei saatu yhteyttä" @@ -5117,7 +5142,7 @@ msgid "New &tab" msgstr "&Uusi välilehti" -#: ../../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 "Uusi kirjan&merkki" @@ -5137,13 +5162,13 @@ #: ../../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/sitemanager_dialog.cpp:2183 msgid "New bookmark" msgstr "Uusi kirjanmerkki" -#: ../../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 "Uusi hakemisto" @@ -5162,7 +5187,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:585 #: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Uusi sivusto" @@ -5170,11 +5195,11 @@ msgid "Next to the transfer queue" msgstr "Seuraavana siirtojonossa" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Ei" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Mitään osoitetta ei ole sidottu kohteelle 'nodename'" @@ -5182,11 +5207,11 @@ msgid "No category to export selected" msgstr "Luokkaa ei ole valittu vientiin." -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Komentoa ei annettu, keskeytetään." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Ulkoista IP-osoitetta ei asetettu, kokeillaan oletusta." @@ -5208,27 +5233,27 @@ msgid "No images available" msgstr "Kuvia ei ole saatavilla." -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "Jonossa ei ole enempää tiedostoja!" -#: ../../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 "Suodatinjoukolle ei ole annettu nimeä." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Mitään ohjelmaa ei ole sidottu tietostotyyppiin" -#: ../../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 "" "Mitään ohjelmaa ei ole sidottu muokkaamista varten tiedostoihin, joiden " "pääte on '%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Ei reittiä isännälle" @@ -5240,7 +5265,7 @@ msgid "No sites available" msgstr "Sivustoja ei ole saatavilla" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Ei tukea SOCKS5 todentamismenetelmälle" @@ -5258,18 +5283,18 @@ msgid "None selected yet" msgstr "Mitään ei ole vielä valittu" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Normaali" @@ -5279,16 +5304,16 @@ 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:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Ei yhdistetty" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Ei yhdistetty mihinkään palvelimeen" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Ei yhdistetty mihinkään palvelimeen." @@ -5296,11 +5321,11 @@ msgid "Not connected." msgstr "Ei yhdistetty." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Ei alustettu, WSAStartup'in kutsua tarvitaan" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5345,13 +5370,13 @@ #: ../../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" @@ -5369,7 +5394,7 @@ "Seuraavilla sivuilla määritetään valittu siirtotapa, kuten palautustila, jos " "käytössä." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Kerran" @@ -5417,8 +5442,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 "Avaus epäonnistui" @@ -5441,15 +5466,15 @@ msgid "Operating System:" msgstr "Käyttöjärjestelmä:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Toiminto on jo käynnissä" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Toiminto käynnissä" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Toiminto ei ole tuettu" @@ -5461,7 +5486,7 @@ msgid "Other SFTP options" msgstr "Muut SFTP-valinnat" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Muu järjestelmävirhe" @@ -5469,8 +5494,8 @@ msgid "Other:" msgstr "Muu:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Muisti loppui" @@ -5480,7 +5505,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:142 msgid "Overwrite &if source newer" -msgstr "Korvaa, &jos lähde uudempi" +msgstr "Korvaa, jos &lähde uudempi" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1406 #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1429 @@ -5518,7 +5543,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Korvaa, jos eri&kokoisia tai lähde on uudempi" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Itserakennettu tyyppi: %s\n" @@ -5545,7 +5570,7 @@ msgid "P&roxy host:" msgstr "Välityspalvelimen &isäntä:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT-komento reitittimen tai palomuurin hylkäämä." @@ -5553,11 +5578,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssiivinen (suositus)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parametri ei ole kelvollinen URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Jäsennetään %d tavua versiotiedoista.\n" @@ -5566,7 +5591,7 @@ #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:59 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:201 msgid "Pass&word:" -msgstr "S&alasana:" +msgstr "&Salasana:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:73 msgid "Passive (recommended)" @@ -5577,13 +5602,13 @@ msgid "Passive mode" msgstr "Passiivitila" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../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 "Passiivitila asetettu siirtotavan oletukseksi." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Tarvitaan salasana" @@ -5592,13 +5617,13 @@ msgid "Path" msgstr "Polku" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../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 "Polkua ei voi muodostaa hakemistoon %s ja alihakemistoon %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Polkua ei löydy:" @@ -5617,8 +5642,8 @@ msgid "Permission" msgstr "Lupa" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Lupa evätty" @@ -5631,7 +5656,7 @@ msgid "Platform:" msgstr "Käyttötaso:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../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." @@ -5647,11 +5672,11 @@ "Määritä kaikki palomuurit ja reitittimet niin, että FileZilla voi muodostaa " "ulosmenevän yhteyden mihin tahansa porttiin." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:578 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5687,7 +5712,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Anna uusi nimi kopioidulle suodattimelle." -#: ../../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 "Anna uusi nimi suodatinjoukolle \"%s\"" @@ -5717,7 +5742,7 @@ msgid "Please enter a password for this server:" msgstr "Anna salasana tälle palvelimelle:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5735,7 +5760,7 @@ "Anna aikakatkaisu väliltä 10-9999 sekuntia tai 0 ottaaksesi aikakatkaisun " "pois käytöstä." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Anna nimi tälle suodatinjoukolle" @@ -5743,11 +5768,11 @@ msgid "Please enter a username for this server:" msgstr "Anna käyttäjänimi tälle palvelimelle:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Anna kelvollinen porttialue." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "Anna URL, josta ulkoinen osoite haetaan." @@ -5758,7 +5783,7 @@ msgstr "" "Anna latausnopeus palvelimelle, joka on suurempi tai yhtäsuuri kuin 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5766,14 +5791,14 @@ "Anna FTP-komento.\n" "Käytettäessä FTP-komentoja, välimuistin hakemisto tyhjennetää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: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 "Anna hakemiston nimi:" -#: ../../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 "Anna luotavan tiedoston nimi:" @@ -5781,12 +5806,12 @@ 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:158 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Anna ulkoinen IP-osoitteesi." -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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 " @@ -5803,7 +5828,7 @@ msgstr "" "Seuraa ohjeita huolella, koska väärä määritys estää onnistuneet FTP-yhteydet." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../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." @@ -5811,11 +5836,11 @@ "Varmista, että FileZillalla on oikeus muodostaa ulosmeneviä yhteyksiä ja " "että annoit osoitteen oikeassa muodossa." -#: ../../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 "Varmista, että pyydetty lokaali on asennettu järjestelmääsi." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../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 " @@ -5838,7 +5863,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:686 +#: ../../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." @@ -5854,7 +5879,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:586 +#: ../../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 " @@ -5863,7 +5888,7 @@ "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:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Valitse toiminto:" @@ -5898,7 +5923,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Valitse uudet määritteet valituille tiedostoille." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../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. " @@ -5930,11 +5955,11 @@ msgstr "Varaaminen" #: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Esimääritetyt sivustot" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Sisällytetään aikaleimoja" @@ -5942,7 +5967,7 @@ msgid "Preview:" msgstr "Esikatselu:" -#: ../../locales/../src/engine/tlssocket.cpp:1112 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "Ensisijaisen yhteyden ja datayhteyden sertifikaatit eivät täsmää." @@ -5958,7 +5983,7 @@ msgid "Prioritize directories (default)" msgstr "Aseta hakemistot tärkeysjärjestykseen (oletus)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Prioriteetti" @@ -5988,7 +6013,7 @@ msgid "Process &Queue" msgstr "Käsittele jo&no" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Prosessin tiedostotaulukon ylivuoto" @@ -5998,11 +6023,11 @@ msgid "Processed %s in %s." msgstr "Käsitelty %s kohteessa %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protokolla ei ole tuettu" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokollaa ei tueta annetulle socket-rajapinnan tyypille" @@ -6019,7 +6044,7 @@ msgid "Proxy &user:" msgstr "Välityspalvelimen &käyttäjä:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Välityspalvelimen todennus epäonnistui" @@ -6029,28 +6054,32 @@ msgid "Proxy handshake failed: %s" msgstr "Välityspalvelimen kättely epäonnistui: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Välityspalvelimen vastaus: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, fuzzy, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Välityspalvelimen pyyntö epäonnistui: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Välityspalvelimen pyyntö epäonnistui: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4241 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Välityspalvelin asetettu, mutta isäntä tai portti epäkelpo" @@ -6066,7 +6095,7 @@ msgid "Public permissions" msgstr "Julkiset oikeudet" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Jono käsitelty onnistuneesti" @@ -6085,11 +6114,11 @@ msgid "Queue: empty" msgstr "Jono: tyhjä" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "Jonossa olevat tiedostot" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Jono:" @@ -6106,7 +6135,7 @@ msgid "R&eset and requeue selected files" msgstr "R&esetoi ja laita valitut tiedostot jonoon uudestaan" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "FTP-komento" @@ -6123,7 +6152,7 @@ msgid "Re&name" msgstr "Nimeä &uudelleen" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6139,12 +6168,12 @@ msgid "Read-only" msgstr "Vain luku" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Perutetaanko toiminto?" -#: ../../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 "" @@ -6152,34 +6181,34 @@ msgstr[0] "Poistetaanko %d hakemisto sisältöineen palvelimelta?" msgstr[1] "Poistetaanko %d hakemistot sisältöineen palvelimelta?" -#: ../../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] "Poistetaanko %d tiedosto palvelimelta?" msgstr[1] "Poistetaanko %d tiedostoa palvelimelta?" -#: ../../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 "Poistetaanko %s ja %s palvelimelta?" -#: ../../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 "Poistetaanko kaikki valitut tiedostot ja/tai hakemistot palvelimelta?" -#: ../../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 "" "Poistetaanko kaikki valitut tiedostot ja/tai hakemistot tietokoneeltasi?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Syy" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Käynnistä tietokone uudellen nyt" @@ -6187,36 +6216,36 @@ msgid "Rec&urse into subdirectories" msgstr "Rek&ursoi alihakemistoihin" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Vastaanotettu TLS -hälytys palvelimelta: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2958 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Vastaanotettiin yli 10000 merkin rivi, keskeytetään." -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Vastaanotettu data hylättiin" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Vastaanotettiin virheellinen merkki versiotiedoissa" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Vastaanotettiin tuntematon TLS -hälytys %d palvelimelta" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Vastaanotettu versiotietojen tiedosto on liian suuri" @@ -6249,13 +6278,13 @@ msgid "Recursively deleting files and directories." msgstr "Poistetaan tiedostoja ja hakemistoja rekursiivisesti." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Uudelleenohjaus epäkelpoon tai ei-tuettuun osoitteeseen: %s" @@ -6265,7 +6294,7 @@ msgid "Refresh the file and folder lists" msgstr "Päivitä tiedosto- ja kansiolistaukset" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "&Muistetaanko salasanat?" @@ -6273,20 +6302,20 @@ msgid "Remote" msgstr "Palvelin" -#: ../../locales/../src/engine/tlssocket.cpp:830 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Palvelimen sertifikaatti ei ole luotettava." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Palvelimen tiedosto" -#: ../../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 "Palvelimen tiedostohaku" @@ -6325,11 +6354,11 @@ "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen, " "absoluuttinen polku." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Palvelimen polkua ei voitu jäsentää." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Palvelimen polkumääritys:" @@ -6369,29 +6398,29 @@ msgid "Rename selected files and directories" msgstr "Nimeä uudelleen tiedostot ja hakemistot" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Nimetään uudelleen '%s' '%s':ksi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Bugien ja ominaisuuspyyntöjen raportointi" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Pyyntö hylättiin tai epäonnistui" @@ -6407,28 +6436,28 @@ msgid "Reset and requeue &all" msgstr "Resetoi ja laita &kaikki tiedostot jonoon uudestaan" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Selvitetty protokolla tuntematon" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../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 "Selvitetään osoitetta kohteelle %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Resurssi ei ole tällä hetkellä saatavilla" -#: ../../locales/../src/engine/logging.cpp:112 +#: ../../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 "Vastaus:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Tulokset:" @@ -6447,19 +6476,19 @@ "Palautettaessa ASCII-tiedostoja ne voivat aiheuttaa ongelmia, jos palvelin " "käyttää erilaista rivinlopetuksen muotoa kuin asiakas." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Haetaan kohteen \"%s\" hakemistolistausta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Haetaan hakemistolistausta..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Haetaan ulkoista IP-osoitetta kohteesta %s" @@ -6476,7 +6505,7 @@ msgid "S&hutdown system" msgstr "Sa&mmuta tietokone" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Pysäytä" @@ -6496,7 +6525,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 -välityspalvelin yhdistää kohteeseen: %s" @@ -6505,17 +6534,17 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Tallennetaanko asetukset?" -#: ../../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 "" "Salasanan tallentaminen on poistettu käytöstä järjestelmänvalvojan toimesta." -#: ../../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 "Salasanan tallentaminen on poistettu käytöstä sinun toimesta." @@ -6528,11 +6557,11 @@ msgid "Scanning for files to upload" msgstr "Skannataan tiedostoja ladattavaksi palvelimelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Haku&ehdot:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Etsi &hakemistosta:" @@ -6548,8 +6577,8 @@ msgid "Security information" msgstr "Turvallisuustiedot" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Katso myös: https://wiki.filezilla-project.org/Network_Configuration" @@ -6600,7 +6629,7 @@ msgstr "Valitse tiedosto viedylle datalle" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Valitse tiedosto viedylle jonolle" @@ -6609,7 +6638,7 @@ msgstr "Valitse vientiasetusten tiedosto" #: ../../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 "Valitse tiedosto viedyille sivustoille" @@ -6617,23 +6646,23 @@ msgid "Select file to import settings from" msgstr "Valitse tiedosto, josta asetukset tuodaan" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Valitse palvelimelle ladattava tiedosto" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Valitse tiedostonimi muunnetulle avaintiedostolle" -#: ../../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 "Valitse, miten nämä tiedostot tulisi avata." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Valitse latauksen kohdehakemisto" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Valitse kohteen tiedostonimi" @@ -6645,7 +6674,7 @@ msgid "Select the private data you would like to delete." msgstr "Valitse tyhjennettävät yksityisyystiedot." -#: ../../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." @@ -6659,7 +6688,7 @@ msgstr[0] "Valittu %d hakemisto." msgstr[1] "Valittu %d hakemistoa." -#: ../../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." @@ -6680,7 +6709,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Valittu %s ja %s siirtoa varten." @@ -6718,7 +6747,7 @@ msgid "Selected file is still being edited" msgstr "Valittu tiedosto on vielä muokattavana" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Valittu suodatin toimii ainoastaan paikallisisten tiedostojen kanssa." @@ -6743,7 +6772,7 @@ 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:4317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Lähetetään Keep-Alive komento" @@ -6756,21 +6785,21 @@ msgid "Server &Type:" msgstr "Palvelime&n tyyppi:" -#: ../../locales/../src/engine/tlssocket.cpp:719 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Palvelin ei lopettanut kunnolla TLS-yhteyttä" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Palvelin ei tue merkkejä, jotka eivät ole ASCII-muodossa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6779,15 +6808,15 @@ "Palvelin ei tue tiedostojen palautusta, jotka ovat > %d Gt. Lopeta siirto " "siihen asti, kunnes tiedostokoot täsmäävät." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Palvelin ei tue tiedostoja, jotka ovat > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Palvelin ei tue tiedostoja, jotka ovat > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6796,17 +6825,17 @@ "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:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 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:344 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Palvelin lähetti tyhjän polun." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6814,13 +6843,13 @@ "Palvelin lähetti kirjautumisen lisäkyselyn. Sinun pitää käyttää " "interaktiivista kirjautumistapaa." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6828,15 +6857,15 @@ "Palvelin lähetti passiivisen vastauksen osoitteesta, jota ei voi reitittää. " "Käytetään palvelimen osoitetta." -#: ../../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: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:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:519 +#: ../../locales/../src/interface/netconfwizard.cpp:530 msgid "Server sent unexpected reply." msgstr "Palvelin lähetti odottamattoman vastauksen." @@ -6852,7 +6881,7 @@ msgid "Server&type:" msgstr "Palveli&ntyyppi:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Palvelin/Paikallinen tiedosto" @@ -6869,8 +6898,8 @@ msgid "Set &Priority" msgstr "Aseta &prioriteetti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Aseta oikeudet '%s':sta '%s':een" @@ -6895,7 +6924,7 @@ msgid "Show &welcome dialog..." msgstr "&Näytä tervetuloikkuna..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Näytetäänkö molemmat hakemistopuut ja jatketaan vertailua?" @@ -6915,7 +6944,7 @@ msgid "Shows this help dialog" msgstr "Näyttää tämän apuikkunan" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Sammutetaan nyt" @@ -6990,7 +7019,7 @@ "Sivustonhallintaan.\n" "Lisätäänkö nykyinen yhteys Sivustonhallintaan?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Koko" @@ -7009,43 +7038,43 @@ msgid "Skip file" msgstr "Hylkää tiedosto" -#: ../../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: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 "Ohitetaan %s:n lataus palvelimelta" -#: ../../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/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 "Ohitetaan %s:n lataus palvelimelle" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Socket-rajapinta osoiteavaruuden ulkopuolella" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket-rajapinta on jo yhdistetty" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Socket-rajapinta sammutettu" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket-rajapintaa ei yhdistetty" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Socket-rajapinnan tyyppi ei ole tuettu osoiteperheelle" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "" "Jotkut tiedostot ovat vielä muokattavana tai tarvitsevat latausta " @@ -7064,7 +7093,7 @@ msgid "Sort directories inline" msgstr "Lajittele linjalla olevat hakemistot" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Lajittelujärjestystä ei voi muuttaa, jos vertaillaan hakemistoja." @@ -7080,7 +7109,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Lähde- ja kohdetiedosto eivät ehkä ole samat" @@ -7092,7 +7121,7 @@ msgid "Source file:" msgstr "Lähdetiedosto:" -#: ../../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" @@ -7130,19 +7159,19 @@ msgid "Start with opened Site Manager" msgstr "Avaa Sivustonhallinta avattuna" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Aloitettu %sn päivitystarkistus\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Aloitetaan %s:n lataus palvelimelta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Aloitetaan %s:n lataus palvelimelle" @@ -7156,11 +7185,11 @@ msgstr "Maa tai lääni:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Tila" -#: ../../locales/../src/engine/logging.cpp:109 +#: ../../locales/../src/engine/logging.cpp:110 #: ../../locales/../src/interface/StatusView.cpp:295 #: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" @@ -7190,11 +7219,11 @@ msgid "Summary of test results:" msgstr "Testituloksien yhteenveto:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Aseta lepotilaan nyt" -#: ../../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." @@ -7202,24 +7231,24 @@ "Tämä valinta ei vaikuta tiedostojen 'symlinkkeihin', sellaiset 'symlinkit' " "poistetaan aina." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Synkronoitu selaus" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synkronoitu selaus poistettu käytöstä." @@ -7233,8 +7262,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Syntaksivirhe komentorivillä" @@ -7246,11 +7275,11 @@ msgid "System details" msgstr "Järjestelmän yksityiskohdat" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Järjestelmän avattuen tiedostojen raja ylittynyt" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Järjestelmän verkon alijärjestelmä epäonnistui" @@ -7258,19 +7287,19 @@ msgid "T&oolbar" msgstr "T&yökalurivi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS -yhteys muodostettu, lähetetään HTTP -pyyntö" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS -yhteys muodostettu, odotetaan tervetulosanomaa..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS -yhteys muodostettu." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL umpeutunut" @@ -7282,15 +7311,15 @@ msgid "Target file:" msgstr "Kohdetiedosto:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Kohdetiedosto on jo olemassa!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Kohdetiedosto on jo olemassa, jatketaanko?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Väliaikainen virhe nimen selvityksessä" @@ -7298,7 +7327,7 @@ msgid "Test results" msgstr "Testitulokset" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Testataan palvelimen kykyjä jatkaa" @@ -7323,16 +7352,16 @@ "Sivustonhallinta on avoinna toisessa FileZilla 3:n instanssissa.\n" "Sulje se tai dataa ei voi poistaa." -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Antamasi osoite oli: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "ai_family'n jäsen ei tuettu" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "ai_socktype'n jäsen ei ole tuettu" @@ -7371,12 +7400,12 @@ msgid "The data connection could not be established: %s" msgstr "Datayhteyttä ei voitu muodostaa: %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 "Tekstitiedostojen oletusmuokkainta ei löytynyt." -#: ../../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 "Tekstitiedostojen oletusmuokkain on '%s'." @@ -7387,7 +7416,7 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "Annettu suodatinnimi on jo olemassa, valitse toinen nimi." -#: ../../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 "Tarkenne '%s' on jo olemassa listauksessa" @@ -7403,7 +7432,7 @@ "Anna uusi nimi:" #: ../../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" @@ -7434,7 +7463,7 @@ msgstr "Tiedostoa '%s' ei voitu ladata." #: ../../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" @@ -7444,7 +7473,7 @@ "Mitään järjestelmän ohjelmaa ei ole sidottu tähän tiedostotyyppiin." #: ../../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" @@ -7465,7 +7494,7 @@ "Uudemmilla versioilla ladatuista tiedostoista saattaa puuttua dataa.\n" "Jatketaanko?" -#: ../../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" @@ -7514,7 +7543,7 @@ msgid "The following files are currently being edited:" msgstr "Seuraavat tiedostot ovat tällä hetkellä muokattavana:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Ilmainen avoimen lähdekoodin FTP-ratkaisu" @@ -7535,17 +7564,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Paikallista hakemistoa '%s' ei voitu luoda." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Paikallinen hakemisto '%s' ei ole olemassa." -#: ../../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" @@ -7555,7 +7584,7 @@ "Poistetaanko synkronoitu selaus käytöstä ja jatketaan paikallisen hakemiston " "vaihtamista?" -#: ../../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." @@ -7571,16 +7600,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "Jonoa ei tallenneta." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Etähakemisto '%s' ei ole olemassa." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7624,7 +7653,7 @@ msgid "The server could not be added." msgstr "Palvelinta ei voitu lisätä." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Palvelin lähetti odottamattoman tai tuntemattoman vastauksen." @@ -7658,7 +7687,7 @@ "Tuntematon palvelimen isäntäavain. Mitään takeita ei ole, että palvelin " "olisi tietokone, jonka luulet sen olevan." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "'servname'-parametria ei tueta ai_socktype'lle" @@ -7670,19 +7699,19 @@ "Asetukset on tuotu. FileZilla pitää käynnistää uudelleen, jotta kaikki " "asetukset tulevat voimaan." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Määritetty osoiteperhe ei ole tuettu" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Määritetty verkkonimi ei ole enää saatavilla" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Järjestelmä sammutetaan kohta, jollet paina Peruuta." @@ -7694,7 +7723,7 @@ "Kohdetiedosto on jo olemassa.\n" "Valitse toiminto." -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testi epäonnistui. Tallennetaanko asetukset?" @@ -7707,15 +7736,15 @@ msgid "Themes" msgstr "Teemat" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Ei voi poistaa tätä suodatinjoukkoa." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Tätä suodatinjoukkoa ei voi nimetä uudelleen." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7739,7 +7768,7 @@ "Tämä velho auttaa sinua määrittämään minkä tahansa reitittimen ja palomuurin " "asianmukaisesti ja testaa määrityksen." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Aika" @@ -7752,12 +7781,12 @@ msgstr "&Aikakatkaisu sekunneissa:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Aikakatkaisu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 +#: ../../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." @@ -7766,13 +7795,13 @@ msgid "Title:" msgstr "Otsikko:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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 " @@ -7837,15 +7866,15 @@ msgid "Toggles the display of the transfer queue" msgstr "Siirtojono" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Liian pitkä tunnisterivi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Liian monta uudelleenohjausta" -#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/engine/logging.cpp:114 #: ../../locales/../src/interface/StatusView.cpp:289 #: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" @@ -7882,11 +7911,11 @@ msgid "Transfer connection interrupted: %s" msgstr "Siirtoyhteys keskeytetty: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Siirretty data vahingoittui." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Siirretään" @@ -7895,8 +7924,8 @@ msgid "Transfers" msgstr "Siirrot" +#: ../../locales/../src/interface/QueueView.cpp:2944 #: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Siirto valmis" @@ -7908,11 +7937,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Käsittele se&uraavia tiedostotyyppejä ASCII-tiedostoina:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Luota vaihdettuun isäntäavaimeen:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Luota uuteen isäntäavaimeen:" @@ -7950,7 +7979,7 @@ msgid "U&pload" msgstr "L&ataa palvelimelle" -#: ../../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 "Latausrajoitus pal&velimelle:" @@ -7960,15 +7989,15 @@ msgstr "Kä&ytä tiedostotyypin sidoksia, jos saatavilla" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Kä&ytä järjestelmän oletuksia" +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 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Määrittelemätön virhekoodi %d" @@ -7982,12 +8011,12 @@ msgid "Unknown" msgstr "Tuntematon" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Tuntematon FTP-välityspalvelimen tyyppi, ei voi luoda kirjautumisaluetta." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Tuntematon SOCKS-protokollaversio: %d" @@ -8000,7 +8029,7 @@ msgid "Unknown host key" msgstr "Tuntematon isäntäavain" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8015,8 +8044,8 @@ msgstr "" "Tuntematon juurielementti, tiedosto ei näytä olevan FileZilla-tiedosto." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../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." @@ -8024,7 +8053,7 @@ "Siihen asti kunnes nämä ongelmat korjataan, aktiivitilan FTP ei toimi ja " "passiivitilaa täytyy käyttää." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../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." @@ -8032,11 +8061,11 @@ "Siihen asti kunnes tämä ongelma korjataan, aktiivitilan FTP ei toimi ja " "passiivitilaa täytyy käyttää." -#: ../../locales/../src/engine/tlssocket.cpp:1074 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Sertifikaatin tyyppi ei tuettu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Uudellenohjaus ei tuettu" @@ -8106,12 +8135,12 @@ msgid "Use &custom editor:" msgstr "Käytä &erillistä muokkainta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Käytä &synkronoitua selausta" @@ -8138,8 +8167,8 @@ msgstr "Käytä Sivustonhallinnan palvelinta" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Käytä järjestelmän o&letuksia" +msgid "Use system &defaults for current language" +msgstr "Käytä järjestelmän &oletuksia nykyiselle kielelle" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8176,7 +8205,7 @@ msgid "User:" msgstr "Käyttäjä:" -#: ../../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 "Käyttäjänimi ei voi olla sarja välilyöntejä" @@ -8198,7 +8227,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Monisanaisia lokisanomia vxWidgets'istä" -#: ../../locales/../src/engine/tlssocket.cpp:1124 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Varmennetaan sertifikaattia..." @@ -8206,7 +8235,7 @@ msgid "Very high" msgstr "Erittäin suuri" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "Näyttää piilotetut valinnat, joita palvelin ei tue" @@ -8222,15 +8251,15 @@ msgid "W&rite" msgstr "K&irjoita" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "Odotetaan" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Odotetaan selauksen yhdistämistä" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Odotetaan salasanaa" @@ -8242,7 +8271,7 @@ msgid "Waiting to retry..." msgstr "Odotetaan uudelleenyritystä..." -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Varoitus, ohitetaan datayhteys väärästä IP:stä." @@ -8265,11 +8294,11 @@ msgid "Warning: Potential security breach!" msgstr "Varoitus: Mahdollinen turva-aukko!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Tervetuloa FileZillaan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Mitä uutta" @@ -8277,7 +8306,7 @@ msgid "What's new:" msgstr "Muutokset:" -#: ../../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." @@ -8301,7 +8330,7 @@ msgid "Widescreen" msgstr "Kokoruutu" -#: ../../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 "Annetaanko FileZillan muistaa salasanat?" @@ -8309,20 +8338,20 @@ msgid "Wr&ite" msgstr "Ki&rjoita" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Väärä ulkoinen IP-osoite" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Väärät rivin lopetukset" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Kyllä" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8332,7 +8361,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Käytät FileZillan uusinta versiota." -#: ../../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 "Voit aina avata tämän ikkunan uudestaan ohjevalikosta." @@ -8369,25 +8398,25 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 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: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 "Olet valinnut enemmän kuin 10 tiedostoa avattavaksi, jatketaanko?" -#: ../../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 "Anna isäntänimi." @@ -8396,30 +8425,31 @@ msgid "You have to enter a key file path" msgstr "Anna avaintiedoston polku" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Anna paikallinen hakemisto." -#: ../../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/netconfwizard.cpp:158 +#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:91 +#, fuzzy +msgid "You have to enter a valid IPv4 address." msgstr "Anna kelvollinen IP-osoite." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Anna paikallinen hakemisto, johon voi kirjoittaa." -#: ../../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 "Anna tilinimi." -#: ../../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 "Anna käyttäjänimi." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8472,23 +8502,23 @@ "Sinun täytyy antaa paikallisen ja palvelimen polut ottaaksesi tämän sivuston " "synkronoidun selauksen käyttöön." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Paikallinen tiedosto pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Palvelimen tiedosto pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Palvelimen polku pitää määrittää." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Palvelin pitää määrittää." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8496,7 +8526,7 @@ "Sinulla ei pitäisi olla ongelmia yhdistettäessä toisille palvelimille, " "tiedostonsiirtojen pitäisi toimia oikein." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Tietokoneesi asetetaan lepotilaan, jollet klikkaa Peruuta." @@ -8521,7 +8551,7 @@ msgid "contains" msgstr "sisältää" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "muokattu" @@ -8543,19 +8573,19 @@ msgid "equals" msgstr "yhtäsuuri kuin" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "tiedosto" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-lukitustiedosto" -#: ../../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 " @@ -8565,15 +8595,15 @@ "Varmista, että tämä käynnistystiedosto sijaitsee samassa hakemistossa kuin " "FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp kuuluu toiseen FileZillan versioon" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp ei käynnistynyt" -#: ../../locales/../src/engine/tlssocket.cpp:1103 +#: ../../locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ei palauttanut sertifikaatteja" @@ -8629,10 +8659,10 @@ msgid "owner writeable" msgstr "omistajan kirjoittava" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1167 -#: ../../locales/../src/engine/tlssocket.cpp:1178 -#: ../../locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 "tuntematon" @@ -8653,6 +8683,24 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Deleting directories" +#~ msgstr "Poistetaan hakemistoja" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "Usean kuulumattoman hakemiston poistaminen ei ole vielä tuettu" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Usean kuulumattoman hakemiston lataaminen ei ole vielä tuettu" + +#~ msgid "Downloading search results" +#~ msgstr "Ladataan hakutulokset" + +#~ msgid "U&se system defaults" +#~ msgstr "Kä&ytä järjestelmän oletuksia" + +#~ msgid "Use system &defaults" +#~ msgstr "Käytä järjestelmän o&letuksia" + #~ msgid "The XML document is not well-formed: %s" #~ msgstr "XML-asiakirja on väärin muodostettu: %s" diff -Nru filezilla-3.14.1/locales/filezilla.pot filezilla-3.15.0.2/locales/filezilla.pot --- filezilla-3.14.1/locales/filezilla.pot 2015-10-16 09:55:37.000000000 +0000 +++ filezilla-3.15.0.2/locales/filezilla.pot 2016-02-10 19:38:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:55+0200\n" +"POT-Creation-Date: 2016-02-10 20:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,20 +46,20 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1390 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:478 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:764 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1386 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:484 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:743 #, 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/RemoteListView.cpp:1389 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:477 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:763 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:483 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:742 #, c-format msgid "%d file" msgid_plural "%d files" @@ -80,12 +80,12 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2781 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2772 #, c-format msgid "%d files added to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:103 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -157,7 +157,7 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:595 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:617 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -167,7 +167,7 @@ "bug report." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:680 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:702 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -192,7 +192,7 @@ msgid "%w - Proxy password" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "" @@ -245,7 +245,7 @@ msgid "&Always use default editor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "" @@ -283,9 +283,9 @@ #: ../../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:2749 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2944 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3129 +#: ../../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 @@ -298,8 +298,8 @@ #: ../../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:3620 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3676 +#: ../../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/inputdialog.xrc:40 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:34 msgid "&Cancel" @@ -372,14 +372,14 @@ #: ../../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:2829 +#: ../../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/sitemanager.xrc:59 msgid "&Delete" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "" @@ -387,12 +387,12 @@ msgid "&Directory comparison" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:893 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:895 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:966 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:968 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -417,7 +417,7 @@ msgid "&Display size in bytes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "" @@ -438,7 +438,7 @@ msgid "&Download" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "" @@ -471,7 +471,7 @@ msgid "&Enable compression" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3548 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "" @@ -488,7 +488,7 @@ msgid "&Enter custom command..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "" @@ -541,13 +541,13 @@ msgid "&Finish editing and delete local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3151 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "" @@ -610,7 +610,7 @@ msgid "&Install new version" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3144 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "" @@ -635,7 +635,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2654 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2737 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "" @@ -699,11 +699,11 @@ msgid "&New Site" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1663 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:26 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "" @@ -726,7 +726,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:371 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2878 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2885 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "" @@ -803,12 +803,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2681 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "" @@ -829,7 +829,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2823 +#: ../../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 @@ -890,7 +890,7 @@ msgid "&Save as..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "" @@ -959,7 +959,7 @@ msgid "&Speed limits" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "" @@ -971,7 +971,7 @@ msgid "&TLS Ciphers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "" @@ -1014,7 +1014,7 @@ msgid "&Uploads:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "" @@ -1048,7 +1048,7 @@ msgid "&Username:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1657 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "" @@ -1092,12 +1092,12 @@ msgid "'%s' is not a directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:426 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:427 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:440 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1109,7 +1109,7 @@ "changed to 'Ask for password'." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:587 +#: ../../source/FileZilla3/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 " @@ -1164,8 +1164,8 @@ msgid "(example: %Y-%m-%d)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3567 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3584 +#: ../../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 #, c-format @@ -1224,7 +1224,7 @@ msgid "64-bit system" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:27 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "" @@ -1241,9 +1241,9 @@ msgid "A default editor needs to be set." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:742 #: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:157 #: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:744 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" @@ -1267,7 +1267,7 @@ "A file with that name is still being edited. Please close it and try again." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:574 +#: ../../source/FileZilla3/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 " @@ -1280,7 +1280,7 @@ msgid "A new version of FileZilla is available:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:647 +#: ../../source/FileZilla3/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." @@ -1292,7 +1292,7 @@ "you need this." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:257 +#: ../../source/FileZilla3/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?" @@ -1342,11 +1342,11 @@ #: ../../source/FileZilla3/locales/../src/engine/server.cpp:862 #: ../../source/FileZilla3/locales/../src/engine/server.cpp:883 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:153 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:154 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:187 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:539 +#: ../../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 msgid "Account" @@ -1372,19 +1372,19 @@ msgid "Active mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:620 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:607 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:595 +#: ../../source/FileZilla3/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 " @@ -1395,7 +1395,7 @@ msgid "Active mode IP" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "" @@ -1414,7 +1414,7 @@ msgid "Add to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:505 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:530 msgid "Address type not supported" msgstr "" @@ -1431,7 +1431,7 @@ "builds at your own risk." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "" @@ -1439,7 +1439,7 @@ msgid "Algorithm:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2950 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "" @@ -1447,7 +1447,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2946 +#: ../../source/FileZilla3/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." @@ -1462,7 +1462,7 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "" @@ -1490,37 +1490,37 @@ "website:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1911 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1821 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../source/FileZilla3/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 "" #: ../../source/FileZilla3/locales/../src/engine/server.cpp:885 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:152 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:190 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:206 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:538 +#: ../../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 msgid "Anonymous" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:943 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:945 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1529,11 +1529,11 @@ msgid "Any changes made in the Site Manager could not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:212 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:969 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "" @@ -1557,7 +1557,7 @@ msgid "Archive" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1095 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "" @@ -1575,7 +1575,7 @@ #: ../../source/FileZilla3/locales/../src/engine/server.cpp:856 #: ../../source/FileZilla3/locales/../src/engine/server.cpp:877 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:181 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "" @@ -1587,7 +1587,7 @@ msgid "Ask your operating system for the external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "" @@ -1607,7 +1607,7 @@ msgid "Attribute" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:671 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "" @@ -1636,11 +1636,11 @@ msgid "B&ypass proxy" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1059 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "" @@ -1653,7 +1653,7 @@ msgid "Being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1089 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "" @@ -1671,11 +1671,11 @@ msgid "Bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "" @@ -1691,7 +1691,7 @@ msgid "Build information" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:241 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "" @@ -1727,22 +1727,22 @@ msgid "CPU features:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1225 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1211 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1571 msgid "Calculating timezone offset of server..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:668 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:648 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:714 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:650 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:718 msgid "Can't write data to file." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:650 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:716 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:652 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:720 #, c-format msgid "Can't write data to file: %s" msgstr "" @@ -1760,13 +1760,13 @@ #: ../../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:2716 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2884 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2974 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3186 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3256 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3738 +#: ../../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 msgid "Cancel" msgstr "" @@ -1784,15 +1784,15 @@ msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:560 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1112 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:349 +#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:352 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1808,22 +1808,22 @@ msgid "Cannot create new filter" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1700 +#: ../../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:712 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:696 msgid "Cannot edit file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1582 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1591 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1838,11 +1838,11 @@ msgid "Cannot load key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:993 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:444 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "" @@ -1851,20 +1851,20 @@ msgid "Cannot rename entry" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1589 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:148 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:174 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:339 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:403 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:340 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:303 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "" @@ -1931,7 +1931,7 @@ msgid "Changing logfile settings requires restart of FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:574 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "" @@ -1959,19 +1959,19 @@ msgid "Check for updates failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:770 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "" @@ -1979,12 +1979,12 @@ msgid "Checking for updates..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:715 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:711 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "" @@ -1999,11 +1999,11 @@ #: ../../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:2242 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "" @@ -2041,7 +2041,7 @@ msgid "Clear quickconnect bar" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:586 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "" @@ -2058,8 +2058,8 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/menus.xrc:40 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1134 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1155 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1135 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "" @@ -2075,7 +2075,7 @@ msgid "Co&mments:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:756 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:747 msgid "Column properties" msgstr "" @@ -2087,21 +2087,21 @@ msgid "Command and its arguments should be properly quoted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:224 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../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 msgid "Command failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:502 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:527 msgid "Command not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:211 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:212 msgid "Command not supported by this protocol" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:111 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:112 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:283 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:339 msgid "Command:" @@ -2111,12 +2111,12 @@ msgid "Comment" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:239 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:441 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:456 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:439 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "" @@ -2163,7 +2163,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "" @@ -2179,24 +2179,24 @@ msgid "Configure port range" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:768 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:129 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1664 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1394 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../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/search.cpp:724 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.h:45 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:708 msgid "Confirmation needed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:582 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "" @@ -2204,6 +2204,11 @@ msgid "Connect bypassing proxy settings" msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "" @@ -2216,29 +2221,25 @@ msgid "Connect to specified Site Manager site" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:326 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:222 #: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:210 #, c-format msgid "Connecting to %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1049 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1051 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:957 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:243 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:369 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:355 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:959 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:268 #, c-format msgid "Connecting to %s..." msgstr "" @@ -2247,119 +2248,123 @@ msgid "Connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1073 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:327 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:921 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:217 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:923 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:242 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:926 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:183 -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:680 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:681 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:185 msgid "Connection attempt interrupted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1066 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:558 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1016 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1018 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:353 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:487 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:512 msgid "Connection not allowed by ruleset" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:496 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:521 msgid "Connection refused" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1060 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1069 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1074 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:558 +#: ../../source/FileZilla3/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[1] "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1076 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:383 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:226 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:251 msgid "Connection with proxy established, performing handshake..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:576 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:567 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:625 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1849 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1852 #, 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:1829 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1832 #, c-format msgid "Copy of %s" msgstr "" @@ -2369,7 +2374,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:178 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "" @@ -2379,30 +2384,30 @@ msgid "Could not add connection to Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:757 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:758 msgid "Could not complete operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:185 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1086 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:802 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:139 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:138 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:147 msgid "Could not convert private key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2532 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1374 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2522 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not copy URLs" msgstr "" @@ -2410,17 +2415,17 @@ msgid "Could not copy data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:458 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:165 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2193 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2183 #: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:851 msgid "" "Could not determine the target of the Drag&Drop operation.\n" @@ -2428,11 +2433,11 @@ "files into an Explorer window." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:406 +#: ../../source/FileZilla3/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 " @@ -2440,41 +2445,46 @@ "variable." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:934 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:911 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:929 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:931 msgid "Could not get full remote path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:237 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:251 +#: ../../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." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1574 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:712 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:696 msgid "Could not get temporary directory to download file into." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:857 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:881 msgid "Could not import peer certificates, gnutls_x509_crt_import failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:852 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:108 +#, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:876 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2493,11 +2503,11 @@ msgid "Could not load key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:951 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:953 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2505,7 +2515,7 @@ "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:361 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2513,7 +2523,7 @@ "Synchronized browsing has been disabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:266 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2521,15 +2531,15 @@ "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/RemoteListView.cpp:2532 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1374 msgid "Could not open clipboard" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:105 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:177 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:208 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:106 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:186 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:218 #, c-format msgid "Could not open log file: %s" msgstr "" @@ -2542,7 +2552,11 @@ msgid "Could not parse server address:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "" @@ -2551,34 +2565,38 @@ msgid "Could not read server item." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:344 +msgid "Could not receive data from server." +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2596 #, c-format msgid "Could not seek to offset %s within file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2500 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1063 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:332 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:829 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:610 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" "Could not write \"%s\", any changes to the Site Manager could not be saved: " @@ -2595,16 +2613,16 @@ msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1850 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" "%s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2223 #: ../../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 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" @@ -2614,28 +2632,28 @@ msgid "Could not write \"%s\":" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:331 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:215 -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:280 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:230 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:297 #, c-format msgid "Could not write to log file: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:881 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:985 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:883 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:244 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "" @@ -2643,11 +2661,11 @@ msgid "Crea&te new file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:965 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:967 msgid "Create &missing local directory and enter it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:892 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:894 msgid "Create &missing remote directory and enter it" msgstr "" @@ -2676,45 +2694,45 @@ msgid "Create director&y and enter it" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:897 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1297 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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 msgid "Create directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2619 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:334 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1950 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1932 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3171 #, c-format msgid "Creating directory '%s'..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:178 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:169 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:133 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:118 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:120 #, c-format msgid "Critical file transfer error after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:352 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2742,7 +2760,7 @@ msgid "Cus&tom" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:100 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "" @@ -2769,6 +2787,10 @@ msgid "D&elete" msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "" @@ -2782,7 +2804,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2835 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "" @@ -2798,8 +2820,8 @@ msgid "Data" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:993 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1057 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:971 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "" @@ -2877,7 +2899,7 @@ "Delay between failed connection attempts has to be between 1 and 999 seconds." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:521 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2902,29 +2924,21 @@ msgid "Delete selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:364 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:365 #, c-format msgid "Deleting \"%s\"" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:367 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:368 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:958 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "" @@ -2946,7 +2960,7 @@ msgid "Dire&ctories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "" @@ -2954,13 +2968,13 @@ msgid "Directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2776 +#: ../../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/filelistctrl.cpp:463 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2165 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2167 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:464 msgid "Directory comparison" msgstr "" @@ -2972,11 +2986,11 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:189 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2023 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "" @@ -2984,12 +2998,12 @@ msgid "Directory listing filters" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:197 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:194 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "" @@ -2997,12 +3011,12 @@ msgid "Disa&ble all" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:958 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:960 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:649 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3012,23 +3026,23 @@ msgid "Disconnect from server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:79 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:882 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:987 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:210 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:879 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:881 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:325 +#: ../../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 msgid "Disconnected from server" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1018 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:895 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1020 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:324 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:330 #: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "" @@ -3054,8 +3068,8 @@ msgid "Do the same with &all selected files already being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1137 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1159 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1138 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "" @@ -3076,7 +3090,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:588 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "" @@ -3085,7 +3099,7 @@ msgid "Do you want to reopen this file?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "" @@ -3105,7 +3119,7 @@ msgid "Download" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3556 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "" @@ -3119,9 +3133,9 @@ msgid "Download limit: none" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3103 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:518 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:523 +#: ../../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 msgid "Download search results" msgstr "" @@ -3133,7 +3147,7 @@ msgid "Download selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:965 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3144,38 +3158,30 @@ msgid "Downloading" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" - -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "" - #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:103 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:109 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:87 +#: ../../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 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:109 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:115 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:100 +#: ../../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 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" @@ -3206,7 +3212,7 @@ msgid "E&xport..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:250 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "" @@ -3223,16 +3229,16 @@ "Edit the file with the configured editor and upload changes to the server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:700 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1582 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1591 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1587 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1596 msgid "Editing failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:700 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "" @@ -3240,7 +3246,7 @@ msgid "Email:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2123 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "" @@ -3248,7 +3254,7 @@ msgid "Empty command." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2025 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "" @@ -3294,7 +3300,7 @@ msgid "Encryption details" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:465 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:466 msgid "End comparison and change sorting order?" msgstr "" @@ -3302,15 +3308,15 @@ msgid "Enter &custom command..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2112 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:571 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "" @@ -3324,11 +3330,11 @@ msgid "Enter filter name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:333 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:391 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "" @@ -3357,7 +3363,7 @@ "- ftpes:// for FTP over TLS (explicit)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3383,7 +3389,7 @@ msgid "Error importing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1912 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "" @@ -3392,48 +3398,48 @@ #: ../../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/sitemanager_dialog.cpp:751 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:809 -#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:243 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1833 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:213 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:970 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:822 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:841 +#: ../../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/wrapengine.cpp:938 +#: ../../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 msgid "Error loading xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1822 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:202 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_dialog.cpp:830 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2224 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1851 #: ../../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 msgid "Error writing xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:110 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:111 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:281 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:335 msgid "Error:" @@ -3523,24 +3529,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:525 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:601 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:886 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1778 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:846 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1099 msgid "Failed to change directory" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:51 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:137 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:152 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:154 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:158 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:173 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:175 msgid "Failed to change language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "" @@ -3548,130 +3554,134 @@ msgid "Failed to create backup copy of xml file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:802 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:625 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:613 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:960 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:967 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:951 msgid "Failed to get peer address of data connection, connection closed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:80 +#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "" +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:345 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1022 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:191 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:730 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:721 msgid "Failed to retrieve external ip address, aborting" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:706 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:631 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:322 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:152 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:173 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:130 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:119 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:140 #, 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:154 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:175 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:126 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:147 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:116 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" @@ -3680,11 +3690,11 @@ msgid "Failed to validate settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1083 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "" @@ -3717,7 +3727,7 @@ msgid "File Types" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1065 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "" @@ -3729,7 +3739,7 @@ msgid "File editing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1603 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "" @@ -3746,8 +3756,8 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:124 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:596 -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:681 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:618 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:703 #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1550 msgid "File not found" msgstr "" @@ -3756,38 +3766,38 @@ msgid "File search" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:125 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:116 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:118 #, c-format msgid "File transfer aborted by user after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:135 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:120 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:130 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:128 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:113 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1136 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "" @@ -3799,7 +3809,7 @@ msgid "File would transfer with binary data type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:407 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:429 #: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:66 #: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" @@ -3811,11 +3821,11 @@ "properly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3478 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1440 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" @@ -3828,7 +3838,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:274 +#: ../../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 @@ -3840,13 +3850,13 @@ msgid "Filename &filters..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2192 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2174 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2975 #, c-format msgid "Filename cannot be constructed for directory %s and filename %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1589 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "" @@ -3873,7 +3883,7 @@ msgid "Files currently being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:275 +#: ../../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 @@ -3884,7 +3894,7 @@ msgid "Filesize format" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:276 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:278 #: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:375 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:111 msgid "Filetype" @@ -3922,8 +3932,8 @@ msgid "Filter out items matching none of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:353 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:409 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:354 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "" @@ -3937,11 +3947,11 @@ msgid "Filter validation failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "" @@ -3958,7 +3968,7 @@ msgid "Fingerprint:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:57 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "" @@ -3972,7 +3982,7 @@ msgid "For reliability you should specify a range of at least 10 ports." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:242 +#: ../../source/FileZilla3/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." @@ -3986,7 +3996,7 @@ msgid "Force showing &hidden files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:644 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "" @@ -3999,12 +4009,12 @@ 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:646 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "" @@ -4012,7 +4022,7 @@ msgid "General" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:484 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:509 msgid "General SOCKS server failure" msgstr "" @@ -4025,12 +4035,12 @@ msgid "Get external IP address from the following URL:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:353 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:409 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:354 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:410 msgid "Given filterset name already exists, overwrite filter set?" msgstr "" @@ -4038,22 +4048,22 @@ msgid "Global bookmarks" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:188 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:190 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:184 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:182 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "" @@ -4083,17 +4093,17 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:905 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:992 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:911 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:998 msgid "High" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:907 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:994 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:913 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:73 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:75 msgid "Highest available port has to be a number between 1024 and 65535." msgstr "" @@ -4106,7 +4116,7 @@ msgid "Homepage:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1076 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "" @@ -4122,7 +4132,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:493 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:518 msgid "Host unreachable" msgstr "" @@ -4141,7 +4151,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:141 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:155 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "" @@ -4176,13 +4186,13 @@ "administrator." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:569 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:578 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4195,19 +4205,19 @@ "a new file gets created." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:639 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:597 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" @@ -4235,7 +4245,7 @@ "and will perform some simple tests." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1158 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "" @@ -4255,7 +4265,7 @@ "try to change the default transfer mode." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:584 +#: ../../source/FileZilla3/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 " @@ -4280,7 +4290,7 @@ "you're running FileZilla on." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:610 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4330,13 +4340,13 @@ "to be done for this." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1095 +#: ../../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:322 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "" @@ -4346,21 +4356,21 @@ "Please try again later." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:107 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:111 msgid "Insecure algorithm!" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "" @@ -4368,41 +4378,42 @@ msgid "Interface" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1062 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:218 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:328 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:220 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1050 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:454 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:510 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:456 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:368 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:378 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 msgid "Invalid data received" msgstr "" @@ -4440,20 +4451,20 @@ "ftpes:// for FTP over TLS (explicit)." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:402 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:397 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "" @@ -4481,23 +4492,23 @@ msgid "Invalid username given." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1083 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1085 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:252 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:254 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:253 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "" @@ -4505,7 +4516,7 @@ msgid "Keep directories on top" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:648 +#: ../../source/FileZilla3/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 " @@ -4536,11 +4547,11 @@ msgid "Language" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1440 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:277 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:279 #: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:376 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:112 msgid "Last modified" @@ -4570,7 +4581,7 @@ msgid "Limit:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "" @@ -4578,11 +4589,12 @@ msgid "Linked against" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:282 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:264 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:117 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:118 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:292 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:363 msgid "Listing:" @@ -4597,11 +4609,11 @@ msgid "Local" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1047 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1075 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "" @@ -4609,21 +4621,21 @@ msgid "Local file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:312 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:370 -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:462 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:371 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:463 #, c-format msgid "Local file is %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:308 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309 msgid "Local file is a directory instead of a regular file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:349 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "" @@ -4635,7 +4647,7 @@ msgid "Local site:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:246 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "" @@ -4643,24 +4655,28 @@ msgid "Log file" msgstr "" +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "" + #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" @@ -4675,17 +4691,17 @@ "'%s' or '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:900 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:987 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:906 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:898 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:985 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:904 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:67 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:69 msgid "Lowest available port has to be a number between 1024 and 65535." msgstr "" @@ -4697,44 +4713,44 @@ msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:781 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:793 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:808 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../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 #, c-format msgid "Malformed chunk data: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:549 msgid "Malformed reply, server not sending proper line endings" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2582 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:296 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:302 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:308 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:312 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:319 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:325 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:331 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:349 +#: ../../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 msgid "Manual transfer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "" @@ -4742,12 +4758,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1089 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:387 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1750 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:388 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "" @@ -4755,7 +4771,7 @@ msgid "Message log position" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1072 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "" @@ -4775,17 +4791,17 @@ msgid "Move &up" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:977 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:967 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:964 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:271 msgid "My Sites" msgstr "" @@ -4820,7 +4836,7 @@ msgid "Need to enter filter name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:388 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "" @@ -4828,18 +4844,18 @@ msgid "Need to specify a character encoding" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1093 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1080 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:490 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1064 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:515 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "" @@ -4855,7 +4871,7 @@ msgid "New &tab" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2818 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "" @@ -4874,14 +4890,14 @@ #: ../../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_dialog.cpp:2180 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:695 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2183 msgid "New bookmark" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1126 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1310 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1225 +#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1306 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "" @@ -4898,9 +4914,9 @@ msgid "New folder" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2156 #: ../../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 msgid "New site" msgstr "" @@ -4908,11 +4924,11 @@ msgid "Next to the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1091 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "" @@ -4920,11 +4936,11 @@ msgid "No category to export selected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2123 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "" @@ -4946,25 +4962,25 @@ msgid "No images available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2977 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:339 -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:403 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:340 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2909 #, c-format msgid "No program has been associated to edit files with the extension '%s'." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1067 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "" @@ -4976,7 +4992,7 @@ msgid "No sites available" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:461 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:486 msgid "No supported SOCKS5 auth method" msgstr "" @@ -4994,19 +5010,19 @@ msgid "None selected yet" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1087 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1073 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:153 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:178 -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:539 +#: ../../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/queue.cpp:903 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:990 msgid "Normal" msgstr "" @@ -5015,16 +5031,16 @@ msgid "Not all items could be requeued for transfer." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:179 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:482 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:180 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2021 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:560 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "" @@ -5032,11 +5048,11 @@ msgid "Not connected." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1108 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:646 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" @@ -5077,13 +5093,13 @@ #: ../../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:2710 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2968 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3180 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3249 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3445 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3614 -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3670 +#: ../../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/dialogs.xrc:3621 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3677 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/inputdialog.xrc:34 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:27 msgid "OK" @@ -5099,7 +5115,7 @@ "well as the fallback mode if enabled." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:859 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "" @@ -5143,8 +5159,8 @@ msgid "Opened as:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1695 -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1707 +#: ../../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 msgid "Opening failed" @@ -5167,19 +5183,19 @@ msgid "Operating System:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1058 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1049 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1070 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:240 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "" @@ -5187,16 +5203,16 @@ msgid "Other SFTP options" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1103 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:262 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1053 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1054 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1039 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "" @@ -5244,7 +5260,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:218 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "" @@ -5269,7 +5285,7 @@ msgid "P&roxy host:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:503 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "" @@ -5277,11 +5293,11 @@ msgid "Pa&ssive (recommended)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2320 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:542 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "" @@ -5301,13 +5317,13 @@ msgid "Passive mode" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:603 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:616 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:627 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:597 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:610 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:621 msgid "Passive mode has been set as default transfer mode." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "" @@ -5316,13 +5332,13 @@ msgid "Path" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2238 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2220 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3058 #, c-format msgid "Path cannot be constructed for directory %s and subdir %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2278 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "" @@ -5341,8 +5357,8 @@ msgid "Permission" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1046 -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1055 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1032 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "" @@ -5355,7 +5371,7 @@ msgid "Platform:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:568 +#: ../../source/FileZilla3/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." @@ -5367,11 +5383,11 @@ "outgoing connection to arbitrary ports." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:638 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:632 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:577 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5404,7 +5420,7 @@ msgid "Please enter a new name for the copied filter." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:389 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "" @@ -5434,7 +5450,7 @@ msgid "Please enter a password for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5446,7 +5462,7 @@ "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:333 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "" @@ -5454,11 +5470,11 @@ msgid "Please enter a username for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:197 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:176 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "" @@ -5468,20 +5484,20 @@ msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:571 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:897 -#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1123 -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1297 -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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 msgid "Please enter the name of the directory which should be created:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2619 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "" @@ -5489,12 +5505,12 @@ msgid "Please enter username and password for this server:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:157 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:608 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:621 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:602 +#: ../../source/FileZilla3/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 " @@ -5507,17 +5523,17 @@ "prevent successful FTP connections." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:632 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:136 +#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:157 msgid "Please make sure the requested locale is installed on your system." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:609 +#: ../../source/FileZilla3/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 " @@ -5533,7 +5549,7 @@ "discard." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:686 +#: ../../source/FileZilla3/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." @@ -5545,14 +5561,14 @@ "often or in too short intervals." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:585 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "" @@ -5587,7 +5603,7 @@ msgid "Please select the new attributes for the selected files." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:596 +#: ../../source/FileZilla3/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. " @@ -5600,8 +5616,8 @@ msgid "Positio&n of the message log:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:247 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:248 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:251 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:252 msgid "Postal code:" msgstr "" @@ -5613,12 +5629,12 @@ msgid "Preallocation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1901 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:270 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:685 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "" @@ -5626,7 +5642,7 @@ msgid "Preview:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1112 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "" @@ -5642,7 +5658,7 @@ msgid "Prioritize directories (default)" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "" @@ -5670,7 +5686,7 @@ msgid "Process &Queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1051 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "" @@ -5680,11 +5696,11 @@ msgid "Processed %s in %s." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1056 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1110 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "" @@ -5701,36 +5717,40 @@ msgid "Proxy &user:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:471 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:496 msgid "Proxy authentication failed" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:103 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:115 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:105 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:329 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:354 #, c-format msgid "Proxy reply: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:384 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:512 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:537 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "" + +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:409 #, c-format msgid "Proxy request failed: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:536 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:561 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "" @@ -5746,7 +5766,7 @@ msgid "Public permissions" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3057 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "" @@ -5765,11 +5785,11 @@ msgid "Queue: empty" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:434 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "" @@ -5786,7 +5806,7 @@ msgid "R&eset and requeue selected files" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:585 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "" @@ -5803,7 +5823,7 @@ msgid "Re&name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:591 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5817,12 +5837,12 @@ msgid "Read-only" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1022 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1386 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:761 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1382 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:740 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -5830,33 +5850,33 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1384 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:759 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1380 +#: ../../source/FileZilla3/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] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1391 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:765 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1387 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:744 #, c-format msgid "Really delete %s and %s from the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1038 +#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1041 msgid "Really delete all selected files and/or directories from the server?" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:129 +#: ../../source/FileZilla3/locales/../src/interface/file_utils.h:45 msgid "Really delete all selected files and/or directories from your computer?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3050 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "" @@ -5864,36 +5884,36 @@ msgid "Rec&urse into subdirectories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:201 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2965 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2957 msgid "Received a directory listing which appears to be encoded in EBCDIC." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:1993 -#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2007 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1006 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1015 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1038 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:989 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:997 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:521 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:204 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:514 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "" @@ -5924,13 +5944,13 @@ msgid "Recursively deleting files and directories." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:649 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:656 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "" @@ -5940,7 +5960,7 @@ msgid "Refresh the file and folder lists" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "" @@ -5948,20 +5968,20 @@ msgid "Remote" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:830 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3099 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:383 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:388 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:397 -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:402 +#: ../../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 msgid "Remote file search" msgstr "" @@ -5993,11 +6013,11 @@ msgid "Remote path cannot be parsed. Make sure it is a valid absolute path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:331 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "" @@ -6037,26 +6057,26 @@ msgid "Rename selected files and directories" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2437 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2419 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3397 #, c-format msgid "Renaming '%s' to '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:375 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:400 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:378 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:403 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:372 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:397 msgid "Request rejected or failed" msgstr "" @@ -6072,28 +6092,28 @@ msgid "Reset and requeue &all" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1098 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1080 -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:457 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1082 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1057 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:112 +#: ../../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:410 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:411 msgid "Response:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "" @@ -6110,19 +6130,19 @@ "ending format than the client." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:938 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:924 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1273 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:935 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:921 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1270 msgid "Retrieving directory listing..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:719 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "" @@ -6139,7 +6159,7 @@ msgid "S&hutdown system" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "" @@ -6159,7 +6179,7 @@ msgid "SOC&KS 4" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:154 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:179 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "" @@ -6168,33 +6188,33 @@ msgid "SQLite:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:857 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:436 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:437 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:978 msgid "Saving of password has been disabled by your system administrator." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:438 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:439 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:980 msgid "Saving of passwords has been disabled by you." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1710 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1704 msgid "Scanning for files to add to queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1712 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "" @@ -6210,8 +6230,8 @@ msgid "Security information" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:579 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:592 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:573 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" @@ -6258,7 +6278,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/export.cpp:34 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1489 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "" @@ -6267,7 +6287,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/export.cpp:32 -#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2208 +#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "" @@ -6275,23 +6295,23 @@ msgid "Select file to import settings from" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:241 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2907 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:507 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:237 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "" @@ -6303,7 +6323,7 @@ msgid "Select the private data you would like to delete." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:475 +#: ../../source/FileZilla3/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." @@ -6317,7 +6337,7 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:473 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6338,7 +6358,7 @@ msgstr[0] "" msgstr[1] "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:479 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "" @@ -6376,7 +6396,7 @@ msgid "Selected file is still being edited" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:303 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "" @@ -6386,7 +6406,7 @@ "Use site-specific bookmarks for this server." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:290 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:291 msgid "Selected port usually in use by a different protocol." msgstr "" @@ -6398,12 +6418,12 @@ msgid "Send custom command to the server otherwise not available" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:251 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "" @@ -6411,77 +6431,77 @@ msgid "Server &Type:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:719 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4168 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4143 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:343 +#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:674 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3708 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3715 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:425 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:464 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:473 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:485 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:509 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:516 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:525 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:536 +#: ../../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 msgid "Server sent unexpected reply." msgstr "" @@ -6497,7 +6517,7 @@ msgid "Server&type:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "" @@ -6514,13 +6534,13 @@ msgid "Set &Priority" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2316 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2298 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3545 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:789 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "" @@ -6540,7 +6560,7 @@ msgid "Show &welcome dialog..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2168 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "" @@ -6560,7 +6580,7 @@ msgid "Shows this help dialog" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3046 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "" @@ -6632,7 +6652,7 @@ "Add current connection to the site manager?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "" @@ -6651,43 +6671,43 @@ msgid "Skip file" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1151 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1168 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1192 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1252 +#: ../../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 #, c-format msgid "Skipping download of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1155 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1171 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1196 -#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1256 +#: ../../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 #, c-format msgid "Skipping upload of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1061 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1063 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1071 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1068 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1111 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1157 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "" @@ -6702,7 +6722,7 @@ msgid "Sort directories inline" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:464 +#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:465 msgid "Sort order cannot be changed if comparing directories." msgstr "" @@ -6718,7 +6738,7 @@ msgid "Source and path of the drop operation are identical" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "" @@ -6730,7 +6750,7 @@ msgid "Source file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../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 msgid "Speed Limits" @@ -6768,19 +6788,19 @@ msgid "Start with opened Site Manager" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:212 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1582 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1568 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2147 #, c-format msgid "Starting download of %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1585 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1571 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2150 #, c-format msgid "Starting upload of %s" msgstr "" @@ -6789,16 +6809,16 @@ msgid "Starts the local site in the given path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:245 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1087 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:109 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:110 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:295 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:370 msgid "Status:" @@ -6812,7 +6832,7 @@ msgid "Stop recursive operation" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:249 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "" @@ -6828,34 +6848,34 @@ msgid "Summary of test results:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3054 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3238 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3245 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:3693 +#: ../../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:238 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:252 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:258 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:268 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:355 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:363 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:371 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:930 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:938 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:944 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:953 -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:979 +#: ../../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 msgid "Synchronized browsing" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:370 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "" @@ -6864,13 +6884,13 @@ 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/cmdline.cpp:76 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:82 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:88 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:97 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:103 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2280 -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2322 msgid "Syntax error in command line" msgstr "" @@ -6882,11 +6902,11 @@ msgid "System details" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1052 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1109 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "" @@ -6894,19 +6914,19 @@ msgid "T&oolbar" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:499 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:524 msgid "TTL expired" msgstr "" @@ -6918,15 +6938,15 @@ msgid "Target file:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2635 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1603 +#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1082 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "" @@ -6934,7 +6954,7 @@ msgid "Test results" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "" @@ -6955,16 +6975,16 @@ "Please close it or the data cannot be deleted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:633 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1088 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1101 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "" @@ -6995,17 +7015,17 @@ "The custom time format is invalid or contains unsupported format specifiers." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:139 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2925 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2932 #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1511 msgid "The default editor for text files could not be found." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2918 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "" @@ -7016,7 +7036,7 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filetype.cpp:154 +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filetype.cpp:153 #, c-format msgid "The extension '%s' does already exist in the list" msgstr "" @@ -7029,7 +7049,7 @@ "Please enter a new name:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1699 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1704 #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1621 #, c-format msgid "" @@ -7055,7 +7075,7 @@ msgid "The file '%s' could not be loaded." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1695 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1700 #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1616 #, c-format msgid "" @@ -7063,7 +7083,7 @@ "No program has been associated on your system with this file type." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1707 +#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1712 #: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1733 #, c-format msgid "" @@ -7080,7 +7100,7 @@ "Do you want to continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:105 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7100,11 +7120,11 @@ "Continue with the import?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:756 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:747 msgid "The filename column can neither be hidden nor moved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:809 +#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:800 msgid "The filename column cannot be hidden." msgstr "" @@ -7122,7 +7142,7 @@ msgid "The following files are currently being edited:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "" @@ -7141,24 +7161,24 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:979 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:981 #, c-format msgid "The local directory '%s' could not be created." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:964 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:966 #, c-format msgid "The local directory '%s' does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:249 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:76 +#: ../../source/FileZilla3/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." @@ -7172,16 +7192,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1832 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:891 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:893 #, c-format msgid "The remote directory '%s' does not exist." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/state.cpp:935 +#: ../../source/FileZilla3/locales/../src/interface/state.cpp:937 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7218,7 +7238,7 @@ msgid "The server could not be added." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:589 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "" @@ -7245,7 +7265,7 @@ "the computer you think it is." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1100 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "" @@ -7255,19 +7275,19 @@ "settings to have effect." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1048 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1113 +#: ../../source/FileZilla3/locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3049 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3045 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "" @@ -7277,7 +7297,7 @@ "Please choose an action." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:857 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "" @@ -7290,15 +7310,15 @@ msgid "Themes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:443 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:383 +#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:590 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7316,7 +7336,7 @@ "you have and tests your configuration." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1204 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "" @@ -7329,25 +7349,25 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:323 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1046 +#: ../../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." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:243 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2166 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2167 +#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" @@ -7399,15 +7419,15 @@ msgid "Toggles the display of the transfer queue" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:113 +#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:114 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:289 #: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:356 msgid "Trace:" @@ -7438,17 +7458,17 @@ msgid "Transfer Settings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:446 -#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:468 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:448 +#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:636 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:333 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:339 #: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "" @@ -7457,8 +7477,7 @@ msgid "Transfers" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2947 -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2950 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "" @@ -7470,11 +7489,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:845 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:843 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "" @@ -7512,7 +7531,7 @@ msgid "U&pload" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3573 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "" @@ -7522,20 +7541,20 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" +msgid "U&se system defaults for current language" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:381 -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:508 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:406 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:533 #, c-format msgid "Unassigned error code %d" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:242 +#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "" @@ -7544,11 +7563,11 @@ msgid "Unknown" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:429 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:454 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "" @@ -7561,7 +7580,7 @@ msgid "Unknown host key" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:437 +#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:462 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7573,24 +7592,24 @@ "Unknown root element, the file does not appear to be generated by FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:611 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:622 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:605 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:598 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1074 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "" @@ -7660,12 +7679,12 @@ msgid "Use &custom editor:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "" @@ -7691,7 +7710,7 @@ msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" +msgid "Use system &defaults for current language" msgstr "" #: ../../source/FileZilla3/locales/../src/interface/resources/xrc/netconfwizard.xrc:194 @@ -7723,7 +7742,7 @@ msgid "User:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:494 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:495 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "" @@ -7745,7 +7764,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1124 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "" @@ -7753,7 +7772,7 @@ msgid "Very high" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "" @@ -7769,15 +7788,15 @@ msgid "W&rite" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1670 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:329 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:330 +#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "" @@ -7785,11 +7804,11 @@ msgid "Waiting for transfer to be cancelled" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:228 +#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:229 msgid "Waiting to retry..." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:974 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "" @@ -7806,11 +7825,11 @@ msgid "Warning: Potential security breach!" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "" @@ -7818,7 +7837,7 @@ msgid "What's new:" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3647 +#: ../../source/FileZilla3/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." @@ -7838,7 +7857,7 @@ msgid "Widescreen" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3642 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "" @@ -7846,20 +7865,20 @@ msgid "Wr&ite" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:448 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:455 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:445 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:857 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:776 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -7869,7 +7888,7 @@ msgid "You are using the latest version of FileZilla." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3432 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3439 msgid "You can always open this dialog again through the help menu." msgstr "" @@ -7902,24 +7921,24 @@ 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:3211 +#: ../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:709 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1665 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:414 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:415 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "" @@ -7928,30 +7947,30 @@ msgid "You have to enter a key file path" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:518 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:89 -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:164 -msgid "You have to enter a valid IP address." +#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:91 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:158 +msgid "You have to enter a valid IPv4 address." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/search.cpp:523 +#: ../../source/FileZilla3/locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:505 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:506 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:479 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:480 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "You have to specify a user name" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:637 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -7998,29 +8017,29 @@ "browsing for this site." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:302 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:319 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:325 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:296 +#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:583 +#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3053 +#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "" @@ -8045,7 +8064,7 @@ msgid "contains" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:216 +#: ../../source/FileZilla3/locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "" @@ -8067,34 +8086,34 @@ msgid "equals" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:529 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:548 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:575 -#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:591 +#: ../../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 msgid "file" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:97 +#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "" -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:177 -#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:203 +#: ../../source/FileZilla3/locales/../src/interface/fzputtygen_interface.cpp:176 +#: ../../source/FileZilla3/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 "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1509 +#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1103 +#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" @@ -8150,10 +8169,10 @@ msgid "owner writeable" msgstr "" -#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:84 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1167 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1178 -#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 msgid "unknown" msgstr "" diff -Nru filezilla-3.14.1/locales/fr.po filezilla-3.15.0.2/locales/fr.po --- filezilla-3.14.1/locales/fr.po 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/locales/fr.po 2016-02-05 08:54:45.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:13+0200\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" "PO-Revision-Date: \n" "Last-Translator: Pgase \n" "Language-Team: Pgase, William GATHOYE 1);\n" -"X-Generator: Poedit 1.8.4\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 @@ -44,9 +44,9 @@ msgstr[0] "%d dossier" msgstr[1] "%d dossiers" -#: ../../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" @@ -55,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" @@ -78,12 +78,12 @@ msgstr[0] "%d fichier. Taille totale : Au moins %s" msgstr[1] "%d fichiers. Taille totale : Au moins %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:104 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -155,7 +155,7 @@ msgstr[0] "%s octet" msgstr[1] "%s octets" -#: ../../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 " @@ -170,7 +170,7 @@ "Veuillez télécharger Filezilla à nouveau. Si le problème persiste, merci de " "soumettre un rapport d'erreur." -#: ../../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 " @@ -203,7 +203,7 @@ msgid "%w - Proxy password" msgstr "%w - Mot de passe Proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "" "Interrompre l&a connexion précédente et se connecter dans l'onglet actuel" @@ -258,7 +258,7 @@ msgid "&Always use default editor" msgstr "Toujours utiliser l'éditeur p&ar défaut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "" "Toujours utiliser l&a sélection pour les types de fichiers qui ne sont pas " @@ -299,9 +299,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 @@ -314,8 +314,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" @@ -388,14 +388,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 "&Supprimer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Supprimer un lien symbolique" @@ -403,14 +403,14 @@ msgid "&Directory comparison" msgstr "Comparaison de &dossier" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -438,7 +438,7 @@ msgid "&Display size in bytes" msgstr "&Afficher la taille en octets" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Ne pas se souvenir &des mots de passe (recommandé)" @@ -459,7 +459,7 @@ msgid "&Download" msgstr "&Télécharger" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Télécharger vers :" @@ -492,7 +492,7 @@ msgid "&Enable compression" msgstr "&Activer la compression" -#: ../../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 "&Activer la limitation des taux de transfert" @@ -509,7 +509,7 @@ msgid "&Enter custom command..." msgstr "Saisir une command&e personnalisée..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Établir une conn&exion dans un nouvel onglet" @@ -562,7 +562,7 @@ msgid "&Finish editing and delete local file" msgstr "&Terminer l'édition et supprimer le fichier local" -#: ../../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" @@ -570,7 +570,7 @@ "É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:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "Sui&vre le lien symbolique, supprimer le contenu du dossier cible" @@ -636,7 +636,7 @@ msgid "&Install new version" msgstr "Installer la nouvelle version" -#: ../../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 "" "Conser&ver la structure du chemin distant relative à la recherche d'origine" @@ -662,7 +662,7 @@ msgstr "Arborescence des dossiers &locaux" #: ../../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 "Dossier &local :" @@ -726,7 +726,7 @@ msgid "&New Site" msgstr "&Nouveau Site" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Nouvelle version disponible !" @@ -753,7 +753,7 @@ msgstr "Valeur &numérique :" #: ../../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&K" @@ -830,12 +830,12 @@ 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:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "Dossier dis&tant :" @@ -856,7 +856,7 @@ msgstr "&Retirer la sélection" #: ../../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 @@ -917,7 +917,7 @@ msgid "&Save as..." msgstr "Enregi&strer sous..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "Rec&hercher" @@ -986,7 +986,7 @@ msgid "&Speed limits" msgstr "Limitation des taux de tran&sfert" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Démarrer le tran&sfert immédiatement" @@ -998,7 +998,7 @@ msgid "&TLS Ciphers" msgstr "Chiffrement &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Tester" @@ -1043,7 +1043,7 @@ msgid "&Uploads:" msgstr "&Envois :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Utiliser un programme personnalisé" @@ -1077,7 +1077,7 @@ msgid "&Username:" msgstr "&Identifiant :" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Version %s" @@ -1123,14 +1123,14 @@ msgid "'%s' is not a directory." msgstr "'%s' n'est pas un dossier." -#: ../../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 "" "Le type d'authentification 'Compte' n'est pas supporté par le protocole " "sélectionné" -#: ../../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." @@ -1146,7 +1146,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:587 +#: ../../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 " @@ -1205,8 +1205,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(exemple : %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 @@ -1284,7 +1284,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 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." @@ -1313,7 +1313,7 @@ "Un fichier portant ce nom est encore en cours d'édition. Veuillez le fermer " "et réessayez." -#: ../../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 " @@ -1332,7 +1332,7 @@ msgid "A new version of FileZilla is available:" msgstr "Une nouvelle version de FileZilla est disponible :" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../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." @@ -1349,7 +1349,7 @@ "Ceci n'est pas requis pour un serveur correctement configuré. Contactez " "l'administrateur du serveur si nécessaire." -#: ../../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?" @@ -1402,11 +1402,11 @@ #: ../../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: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" @@ -1432,7 +1432,7 @@ msgid "Active mode" msgstr "Mode actif" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1440,7 +1440,7 @@ "Le test du mode FTP actif a échoué. FileZilla ne connaît pas l'adresse IP " "externe correcte." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../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." @@ -1448,7 +1448,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:596 +#: ../../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 " @@ -1462,7 +1462,7 @@ msgid "Active mode IP" msgstr "Mode IP actif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "A&jouter les fichiers à la file d'attente uniquement" @@ -1481,7 +1481,7 @@ msgid "Add to queue" msgstr "Ajouter à la file d'attente" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Type d'adresse non supportée" @@ -1504,7 +1504,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Toujours effectuer cette &action" @@ -1512,7 +1512,7 @@ msgid "Algorithm:" msgstr "Algorithme :" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Tous les fichiers ont été transférés avec succès" @@ -1522,7 +1522,7 @@ "Tous les ports de la plage spécifiée doivent être compris entre 1024 et " "65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../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." @@ -1539,7 +1539,7 @@ 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:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Déjà connecté" @@ -1573,7 +1573,7 @@ "Alternativement, vous pouvez également télécharger la dernière version sur " "le site Web de FileZilla :" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1583,7 +1583,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:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1593,7 +1593,7 @@ "\"%s\".\n" "Certains éléments placés en file d'attente ont peut-être été perdus." -#: ../../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." @@ -1602,16 +1602,16 @@ "de destination." #: ../../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/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 "Anonyme" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1624,12 +1624,12 @@ "Les modifications apportées au Gestionnaire de Sites ne peuvent pas être " "sauvegardées." -#: ../../locales/../src/interface/filter.cpp:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Les modifications apportées aux filtres ne seront pas sauvegardées." @@ -1653,7 +1653,7 @@ msgid "Archive" msgstr "Archive" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Débordement de tampon de l'argument" @@ -1671,7 +1671,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Demander le mot de passe" @@ -1683,7 +1683,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Poser vos questions sur les forums de FileZilla" @@ -1703,7 +1703,7 @@ msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Échec de l'authentification." @@ -1733,11 +1733,11 @@ msgid "B&ypass proxy" msgstr "Ignorer le Prox&y" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Descripteur de fichier incorrect" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Instructions pour une première utilisation" @@ -1750,7 +1750,7 @@ msgid "Being edited" msgstr "En cours d'édition" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Attention ! Le certificat a été révoqué" @@ -1768,11 +1768,11 @@ msgid "Bookmark" msgstr "Favori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Favori :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Favoris" @@ -1788,7 +1788,7 @@ msgid "Build information" msgstr "Informations de compilation" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Catégorie d'entreprise :" @@ -1828,8 +1828,8 @@ msgid "CPU features:" msgstr "Caractéristiques du CPU :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Calcul du décalage horaire du serveur..." @@ -1838,12 +1838,12 @@ msgstr "Impossible de lire à partir du fichier" #: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:718 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:718 +#: ../../locales/../src/engine/transfersocket.cpp:720 #, c-format msgid "Can't write data to file: %s" msgstr "Impossible d'écrire les données dans un fichier : %s" @@ -1861,13 +1861,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 "Annuler" @@ -1885,15 +1885,15 @@ 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:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Impossible d'ajouter le serveur au Gestionnaire de Sites" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Impossible d'assigner la requête d'adresse" -#: ../../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?" @@ -1915,20 +1915,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 "Impossible d'éditer le fichier" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 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:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Impossible d'éditer le fichier, le chemin distant est inconnu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1947,12 +1947,12 @@ msgid "Cannot load key file" msgstr "Impossible de charger le fichier de clé" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Impossible de se souvenir du mot de passe" @@ -1961,22 +1961,22 @@ msgid "Cannot rename entry" msgstr "Impossible de renommer l'entrée" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Impossible de renommer le fichier" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Impossible de sauvegarder le jeu de filtres" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Impossible de sélectionner le filtre" @@ -2046,7 +2046,7 @@ "Toutes modifications des paramètres du fichier journal nécessitent un " "redémarrage de FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Problème d'encodage de caractères" @@ -2074,7 +2074,7 @@ msgid "Check for updates failed" msgstr "Échec de la recherche des mises à jour" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2082,7 +2082,7 @@ "Vérifiez vos informations de connexion. Le mot de passe saisi commence ou se " "termine par un espace." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2090,7 +2090,7 @@ "Vérifiez vos informations de connexion. Le nom d'utilisateur saisi commence " "ou se termine par un espace." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Vérification de l'adresse IP externe correcte" @@ -2098,12 +2098,12 @@ msgid "Checking for updates..." msgstr "Recherche des mises à jour..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, 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:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "La somme de contrôle ne correspond pas à celle du fichier %s\n" @@ -2118,11 +2118,11 @@ #: ../../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 "Sélectionnez le dossier local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Paquet de données interrompu incorrectement" @@ -2160,7 +2160,7 @@ msgid "Clear quickconnect bar" msgstr "Vider la barre de connexion rapide" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Cliquez sur Terminer pour sauvegarder vos paramètres." @@ -2177,8 +2177,8 @@ msgstr "Fermer tous les &autres onglets" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Quitter FileZilla" @@ -2206,13 +2206,13 @@ 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: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 "Échec de la commande" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Commande non supportée" @@ -2220,7 +2220,7 @@ msgid "Command not supported by this protocol" msgstr "Commande non supportée par ce protocole" -#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/engine/logging.cpp:112 #: ../../locales/../src/interface/StatusView.cpp:283 #: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" @@ -2230,12 +2230,12 @@ msgid "Comment" msgstr "Commentaire" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Nom commun :" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "La communication est corrompue par un routeur ou un pare-feu." @@ -2282,7 +2282,7 @@ msgstr "Transferts simultanés" #: ../../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 "Les conditions respectent la c&asse" @@ -2298,24 +2298,24 @@ msgid "Configure port range" msgstr "Paramètres de la plage des ports" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Configuration de FileZilla et de votre réseau" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Confirmer la suppression" -#: ../../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 "Confirmation requise" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Félicitations, votre configuration semble fonctionnelle." @@ -2323,6 +2323,11 @@ msgid "Connect bypassing proxy settings" msgstr "Connexion en ignorant les paramètres du Proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Échec de la connexion : %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Connexion dans l'onglet actuel" @@ -2335,29 +2340,25 @@ msgid "Connect to specified Site Manager site" msgstr "Connexion au site spécifié dans le Gestionnaire de Sites" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 -msgid "Connected" -msgstr "Connecté" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Connexion en cours" -#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Connexion à %s via %s Proxy" -#: ../../locales/../src/engine/ControlSocket.cpp:958 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 +#: ../../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 "Connexion à %s..." @@ -2366,120 +2367,124 @@ msgid "Connection" msgstr "Connexion" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Connexion annulée" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Échec de la tentative de connexion" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:927 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Échec de la tentative de connexion avec \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../locales/../src/engine/ControlSocket.cpp:185 #: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Tentative de connexion interrompue par l'utilisateur" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Tentative de connexion expirée" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Connexion interrompue" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Connexion interrompue par le serveur" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Connexion établie, initialisation TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Connexion établie, envoi d'une requête HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Connexion établie, attente du message d'accueil." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Connexion établie, attente du message d'accueil..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Connexion perdue" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Connexion non permise par les règles en vigueur" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Connexion refusée" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Connexion refusée par le serveur" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Connexion réinitialisée par le serveur" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Connexion réinitialisée par un pair" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../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] "Connection interrompue après %d seconde d'inactivité" msgstr[1] "Connection interrompue après %d secondes d'inactivité" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Délai d'attente expiré." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Connexion au serveur perdue" -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Connexion établie avec le Proxy, établissement d'une liaison..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "La connexion avec le serveur a été interrompue prématurément." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "La connexion au serveur de test a échoué." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Convertir le fichier de clé" #: ../../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 "Copie de (%d) sur %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 "Copie de %s" @@ -2499,30 +2504,30 @@ msgid "Could not add connection to Site Manager" msgstr "Impossible d'ajouter une connexion au Gestionnaire de Sites" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Impossible de terminer l'opération" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Impossible d'établir une connexion au serveur" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Impossible d'établir une connexion au serveur : %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 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: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 "Impossible de convertir la clé privée" -#: ../../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 "Impossible de copier les adresses" @@ -2530,17 +2535,17 @@ msgid "Could not copy data" msgstr "Impossible de copier les données" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, 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:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Impossible de créer le journal 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" @@ -2551,11 +2556,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:4095 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Impossible d'établir une connexion au serveur" -#: ../../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 " @@ -2568,11 +2573,11 @@ "utilisant l'option de la ligne de commande '--datadir ' ou en " "paramétrant la variable d'environnement FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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:934 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2580,7 +2585,7 @@ "Impossible d'obtenir le nom de l'émetteur du certificat, " "gnutls_x509_get_issuer_dn a échoué" -#: ../../locales/../src/engine/tlssocket.cpp:911 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2588,28 +2593,33 @@ "Impossible d'obtenir le nom d'objet du certificat, gnutls_x509_get_dn a " "échoué" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Impossible d'obtenir le chemin complet distant." -#: ../../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 "Impossible d'obtenir une réponse de 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 "" "Impossible d'obtenir un dossier temporaire pour y télécharger le fichier." -#: ../../locales/../src/engine/tlssocket.cpp:857 +#: ../../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/engine/tlssocket.cpp:852 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2633,11 +2643,11 @@ msgid "Could not load key file" msgstr "Impossible de charger le fichier de clé" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Impossible de charger la clé privée" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2649,7 +2659,7 @@ "Désactiver la navigation synchronisée et continuer le changement de dossier " "distant ?" -#: ../../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 " @@ -2660,7 +2670,7 @@ "distant '%s'.\n" "La navigation synchronisée est désactivée." -#: ../../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 " @@ -2672,14 +2682,14 @@ "La navigation synchronisée est désactivée." #: ../../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 "Impossible d'ouvrir le presse-papier" -#: ../../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 "Impossible d'ouvrir le journal d'événements : %s" @@ -2692,7 +2702,11 @@ msgid "Could not parse server address:" msgstr "Impossible d'analyser l'adresse du serveur :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Impossible de lire depuis le socket." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Impossible de lire depuis le socket : %s" @@ -2701,29 +2715,33 @@ msgid "Could not read server item." msgstr "Impossible de lire l'étiquette du serveur." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +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/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Impossible d'atteindre la fin du fichier" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Impossible d'envoyer la commande à fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Impossible de générer un processus d'entrée/sortie" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, 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:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Impossible de démarrer le transfert" @@ -2749,7 +2767,7 @@ "Impossible d'écrire \"%s\", les favoris globaux ne peuvent pas être " "sauvegardés : %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2760,7 +2778,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:720 #: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" @@ -2772,28 +2790,28 @@ msgid "Could not write \"%s\":" msgstr "Impossible d'écrire \"%s\" :" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Impossible d'écrire le fichier de clé : %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Impossible d'écrire vers le fichier local" -#: ../../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 "Impossible d'écrire dans le fichier journal : %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Impossible d'écrire vers le socket : %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Pays :" @@ -2801,11 +2819,11 @@ msgid "Crea&te new file" msgstr "Créer un &nouveau fichier" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Créer le dossier local &manquant et y accéder" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Créer le dossier distant &manquant et y accéder" @@ -2835,46 +2853,46 @@ msgid "Create director&y and enter it" msgstr "Créer un dossier et &y accéder" -#: ../../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 "Créer un dossier" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Créer un fichier vide" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Création d'un dossier" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Création du dossier '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Erreur critique" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Erreur critique :" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Erreur critique lors du transfert du fichier" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, 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:352 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2904,7 +2922,7 @@ msgid "Cus&tom" msgstr "Pers&onnaliser" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Jeu de filtres personnalisé" @@ -2932,6 +2950,10 @@ msgid "D&elete" msgstr "Supprim&er" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Comparaison de &dossier" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Tout désact&iver" @@ -2945,7 +2967,7 @@ msgstr "Action du d&ouble-clic sur les dossiers :" #: ../../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 "D&upliquer" @@ -2961,8 +2983,8 @@ msgid "Data" msgstr "Données" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Fermeture prématurée du socket de données." @@ -3083,20 +3105,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Suppression de %u fichiers à partir de \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Suppression des dossiers" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "" -"La suppression de plusieurs dossiers indépendants n'est pas encore supportée" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Suppression de lien symbolique" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Bureau" @@ -3118,7 +3131,7 @@ msgid "Dire&ctories" msgstr "&Dossiers" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Direction" @@ -3126,13 +3139,13 @@ msgid "Directory" msgstr "Dossier" -#: ../../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:2165 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Comparaison de dossier" @@ -3146,11 +3159,11 @@ "Le dossier contenant le fichier journal n'existe pas ou le nom du fichier " "est incorrect." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Affichage du contenu du dossier annulée par l'utilisateur" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Échec de l'affichage du contenu du dossier" @@ -3158,12 +3171,12 @@ msgid "Directory listing filters" msgstr "Filtres d'affichage du contenu du dossier" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Contenu du dossier \"%s\" affiché avec succès" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Contenu du dossier affiché avec succès" @@ -3171,14 +3184,14 @@ msgid "Disa&ble all" msgstr "Tout &désactiver" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:649 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3190,23 +3203,23 @@ msgid "Disconnect from server" msgstr "Déconnecter du serveur actuel" -#: ../../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: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 "Déconnecté du serveur" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../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 "Déconnecté du serveur : %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 "Déconnexion du précédent serveur" @@ -3233,8 +3246,8 @@ msgstr "" "Faire de même avec tous les fichiers sélectionnés déjà en cours d'édition" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Souhaitez-vous vraiment quitter FileZilla ?" @@ -3259,7 +3272,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Souhaitez-vous vraiment supprimer la file d'attente ?" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Souhaitez-vous vraiment envoyer '%s' au serveur ?" @@ -3268,7 +3281,7 @@ msgid "Do you want to reopen this file?" msgstr "Souhaitez-vous rouvrir ce fichier ?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Documentation" @@ -3291,7 +3304,7 @@ msgid "Download" msgstr "Télécharger" -#: ../../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 "&Limite de téléchargement :" @@ -3305,9 +3318,9 @@ msgid "Download limit: none" msgstr "Limite de téléchargement : aucune" -#: ../../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 "Téléchargement des résultats de la recherche" @@ -3319,7 +3332,7 @@ msgid "Download selected files and directories" msgstr "Télécharger les fichiers et dossiers sélectionnés" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3332,28 +3345,18 @@ msgid "Downloading" msgstr "En cours de téléchargement" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Téléchargement de %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "" -"Le téléchargement de plusieurs dossiers indépendants n'est pas encore " -"supporté" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Téléchargement des résultats de recherche" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Téléchargement de la mise à jour..." -#: ../../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 "" @@ -3363,9 +3366,9 @@ "Le glisser-déposer entre plusieurs instances de FileZilla n'est pas encore " "implémenté." -#: ../../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." @@ -3399,7 +3402,7 @@ msgid "E&xport..." msgstr "E&xport..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "Courriel :" @@ -3418,16 +3421,16 @@ "Éditer le fichier avec l'éditeur sélectionné et envoyer les modifications au " "serveur." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "L'édition des dossiers n'est pas supportée" -#: ../../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 "Échec de l'édition" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Édition des résultats de recherche" @@ -3435,7 +3438,7 @@ msgid "Email:" msgstr "Courriel :" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Commande absente" @@ -3443,7 +3446,7 @@ msgid "Empty command." msgstr "Commande non définie." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Ce dossier ne contient aucun élément" @@ -3489,7 +3492,7 @@ msgid "Encryption details" msgstr "Détails du chiffrement" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Arrêter la comparaison et changer l'ordre de tri ?" @@ -3497,15 +3500,15 @@ msgid "Enter &custom command..." msgstr "Saisir une &commande personnalisée..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Saisissez 0 pour aucune limitation." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Saisir une commande" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Saisie d'une commande personnalisée" @@ -3519,11 +3522,11 @@ msgid "Enter filter name" msgstr "Saisie d'un nom pour le filtre" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Saisie d'un nom pour le jeu de filtres" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Saisir un nouveau nom pour le jeu de filtres" @@ -3565,7 +3568,7 @@ "- ftps:// pour le FTP sur TLS (implicite)\n" "- ftpes:// pour le FTP sur TLS (explicite)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3595,7 +3598,7 @@ msgid "Error importing" msgstr "Erreur lors de l'importation" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Erreur lors du chargement de la file d'attente" @@ -3604,14 +3607,14 @@ #: ../../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/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 @@ -3620,32 +3623,32 @@ #: ../../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:939 msgid "Error loading xml file" msgstr "Erreur lors du chargement du fichier xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Erreur lors de la sauvegarde de la file d'attente" -#: ../../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 "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:1851 +#: ../../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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Erreur lors de l'écriture du fichier xml" -#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/engine/logging.cpp:111 #: ../../locales/../src/interface/StatusView.cpp:281 #: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" @@ -3739,24 +3742,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP sur connexion implicite 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/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 "Impossible de changer de dossier" -#: ../../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 "Impossible de changer de langue" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Impossible de copier ou de déplacer les sites" @@ -3764,117 +3767,121 @@ 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:803 +#: ../../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/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Impossible d'obtenir le chemin vers 'Mes Documents'" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Impossible d'obtenir le chemin vers le Bureau" -#: ../../locales/../src/interface/netconfwizard.cpp:961 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:968 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Impossible d'initialiser le moteur FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Impossible d'initialiser le protocole TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Impossible d'initialiser le réseau" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "" "Impossible de charger l'interface, les fichiers de ressources sont-ils " "valides ?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Impossible de charger la clé privée : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Impossible d'ouvrir \"%s\" pour ajout / écriture" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Impossible d'ouvrir \"%s\" pour lecture" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Impossible d'ouvrir \"%s\" pour écriture" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Impossible d'analyser le chemin retourné." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Impossible de réceptionner les données" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Impossible de récupérer le contenu du dossier" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../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/engine/ftpcontrolsocket.cpp:3785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 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" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 +#: ../../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:707 +#: ../../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/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Impossible de récupérer l'adresse IP externe." -#: ../../locales/../src/interface/netconfwizard.cpp:323 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Impossible d'envoyer la commande." -#: ../../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 "" "Impossible de définir la langue sur %s (%s), utilisation de la langue par " "défaut du système" -#: ../../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)." @@ -3882,14 +3889,14 @@ "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:119 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, 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: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" @@ -3897,14 +3904,14 @@ "Impossible de définir la langue sur %s, utilisation de la langue par défaut " "du système" -#: ../../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 "" "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:116 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" @@ -3915,11 +3922,11 @@ msgid "Failed to validate settings" msgstr "Impossible de valider les paramètres" -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Impossible de vérifier le certificat client" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Impossible d'écrire le fichier %s" @@ -3952,7 +3959,7 @@ msgid "File Types" msgstr "Types de fichiers" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Le descripteur de fichier n'est pas un socket" @@ -3964,7 +3971,7 @@ msgid "File editing" msgstr "Édition des fichiers" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Le fichier existe" @@ -3981,8 +3988,8 @@ msgstr "Listes des fichiers" #: ../../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 "Fichier introuvable" @@ -3991,40 +3998,40 @@ msgid "File search" msgstr "Recherche de fichiers" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Transfert de fichier interrompu par l'utilisateur" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, 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:136 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Échec du transfert du fichier" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:131 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Transfert de fichier ignoré" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Transfert de fichier réussi" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Transfert de fichier en cours de progression." @@ -4036,7 +4043,7 @@ msgid "File would transfer with binary data type." msgstr "Transfert de fichier avec type de données binaires." -#: ../../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" @@ -4050,11 +4057,11 @@ "FileZilla peut maintenant tester votre configuration afin de s'assurer que " "tout fonctionne correctement." -#: ../../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 est déjà connecté à un serveur." -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -4069,7 +4076,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 @@ -4080,15 +4087,15 @@ msgid "Filename &filters..." msgstr "&Filtres de contenus..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../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 "" "Le nom de fichier ne peut pas être créé pour le dossier %s et le nom de " "fichier %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Nom de fichier invalide" @@ -4120,7 +4127,7 @@ msgstr "Fichiers en cours d'édition" #: ../../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" @@ -4130,7 +4137,7 @@ msgid "Filesize format" msgstr "Format de la taille des fichiers" -#: ../../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" @@ -4169,8 +4176,8 @@ msgid "Filter out items matching none of the following" msgstr "Filtrer les objets qui correspondent à aucune des conditions suivantes" -#: ../../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 "Jeu de filtres déjà existant" @@ -4184,11 +4191,11 @@ msgid "Filter validation failed" msgstr "Échec de la validation du filtre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Retrouver des &fichiers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Retrouver des doss&iers" @@ -4205,7 +4212,7 @@ msgid "Fingerprint:" msgstr "Empreinte :" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Assistant de configuration du routeur et du pare-feu" @@ -4238,7 +4245,7 @@ msgid "Force showing &hidden files" msgstr "Forcer l'affic&hage des fichiers cachés" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Forcer l'affichage des fichiers cachés" @@ -4253,12 +4260,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Nouveauté trouvée %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Plus de documentation" @@ -4266,7 +4273,7 @@ msgid "General" msgstr "Général" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Échec général du serveur SOCKS" @@ -4279,12 +4286,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Obtenir de l'aide" -#: ../../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 "Le nom de jeu de filtres existe déjà, remplacer le jeu de filtres ?" @@ -4292,22 +4299,22 @@ msgid "Global bookmarks" msgstr "Favoris globaux" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Erreur GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:190 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Erreur GnuTLS %d dans %s" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Erreur GnuTLS %d dans %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Erreur GnuTLS %d: %s" @@ -4337,17 +4344,17 @@ msgstr "Caché" #: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Haute" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Le plus élevé" -#: ../../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 "" "Le port disponible le plus élevé doit être compris entre 1024 et 65535." @@ -4363,7 +4370,7 @@ msgid "Homepage:" msgstr "Site web :" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "L'hôte est hors service" @@ -4379,7 +4386,7 @@ 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:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Hôte inaccessible" @@ -4398,7 +4405,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemple : 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Les adresses IPv6 ne sont pas supportées avec un proxy SOCKS 4" @@ -4445,7 +4452,7 @@ "Si le changement de clé n'était pas prévu, contactez l'administrateur du " "serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4453,7 +4460,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:579 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4471,7 +4478,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: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." @@ -4479,7 +4486,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:640 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4487,7 +4494,7 @@ "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:598 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Si ce problème persiste, veuillez contacter le fabricant de votre routeur." @@ -4525,7 +4532,7 @@ "Si vous cliquez sur Tester, FileZilla se connectera sur probe.filezilla-" "project.org et exécutera quelques tests simples." -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Si vous quittez FileZilla, vos modifications seront perdues." @@ -4552,7 +4559,7 @@ "pour transférer des fichiers, essayez de changer le mode de transfert par " "défaut." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -4587,7 +4594,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:611 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4649,7 +4656,7 @@ "demande un port au serveur et s'y connecte. Aucun paramètre supplémentaire " "n'est nécessaire." -#: ../../locales/../src/engine/tlssocket.cpp:1095 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4657,7 +4664,7 @@ "Chaîne incomplète, le certificat n'est pas un certificat auto-signé par une " "autorité compétente" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Mot de passe incorrect" @@ -4669,22 +4676,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:745 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Initialisation de TLS..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 -#, fuzzy +#: ../../locales/../src/interface/verifycertdialog.cpp:111 msgid "Insecure algorithm!" -msgstr "Signature de l'algorithme :" +msgstr "Algorithme non sécurisé !" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interactif" @@ -4692,29 +4698,29 @@ msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Interrompu par le signal" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Interrompu par l'utilisateur" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Longueur du contenu invalide" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Réponse HTTP invalide" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Argument invalide passé" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../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." @@ -4723,13 +4729,14 @@ "l'option UTF-8 dans le Gestionnaire de Sites pour forcer l'utilisation de " "l'UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Taille du paquet invalide" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../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 "Données reçues invalides" @@ -4774,22 +4781,22 @@ "ftps:// pour le FTP sur TLS (implicite) et\n" "ftpes:// pour le FTP sur TLS (explicite)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Expression invalide dans les conditions de recherche." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Code de réponse invalide" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Conditions de recherche invalides : %s" @@ -4817,23 +4824,23 @@ msgid "Invalid username given." msgstr "Identifiant spécifié invalide." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Valeur invalide pour ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Valeur invalide pour les conseils" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Juridiction du pays :" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Juridiction locale :" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Juridiction d'état ou de province :" @@ -4841,7 +4848,7 @@ msgid "Keep directories on top" msgstr "Maintenir les dossiers en tête" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../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 " @@ -4876,11 +4883,11 @@ msgid "Language" msgstr "Langue" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Langue modifiée" -#: ../../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" @@ -4910,7 +4917,7 @@ msgid "Limit:" msgstr "Limite :" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Longueur de ligne dépassée" @@ -4918,11 +4925,12 @@ msgid "Linked against" msgstr "Dépendances" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Socket d'écoute fermé" -#: ../../locales/../src/engine/logging.cpp:117 +#: ../../locales/../src/engine/logging.cpp:118 #: ../../locales/../src/interface/StatusView.cpp:292 #: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" @@ -4937,11 +4945,11 @@ msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Adresse locale en usage" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Le point de terminaison local a été fermé" @@ -4949,21 +4957,21 @@ msgid "Local file" msgstr "Fichier local" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Le fichier local n'existe pas." -#: ../../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 "Le fichier local est %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 "Le fichier local est un dossier et non un fichier normal." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Le fichier local ne possède pas un nom de fichier valide." @@ -4975,7 +4983,7 @@ msgid "Local site:" msgstr "Site local :" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Localité :" @@ -4983,12 +4991,16 @@ msgid "Log file" msgstr "Fichier journal" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Connecté" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Journalisation" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../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." @@ -4997,7 +5009,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:810 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -5006,7 +5018,7 @@ "se peut que le serveur ne gère pas l'UTF-8. Utilisation du jeu de caractères " "local." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 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 " @@ -5027,17 +5039,17 @@ "L'authentification ne peut être utilisé conjointement qu'avec une URL FTP. " "L'argument doit être '%s' ou '%s'" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Bas" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Le plus bas" -#: ../../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 "" "Le port le plus bas disponible doit être un nombre compris entre 1024 et " @@ -5053,44 +5065,44 @@ "Assurez-vous que le fichier est accessible et qu'il est bien un document XML " "correctement mis en forme." -#: ../../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 "Paquet de données non conforme : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Entête non conforme : %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Transfert manuel" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Correspondances à toutes les conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Correspondances à au moins une des conditions suivantes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Correspondances à aucune des conditions suivantes" @@ -5098,12 +5110,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Nombre maximum de &transferts simultanés :" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Échec de l'allocation de mémoire" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Journal des événements" @@ -5111,7 +5123,7 @@ msgid "Message log position" msgstr "Journal des événements" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Message trop volumineux" @@ -5131,11 +5143,11 @@ msgid "Move &up" msgstr "Déplacer vers le ha&ut" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Ordinateur" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Mes Documents" @@ -5176,7 +5188,7 @@ msgid "Need to enter filter name" msgstr "Saisissez un nom pour le filtre" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Saisissez un chemin distant valide" @@ -5184,11 +5196,11 @@ msgid "Need to specify a character encoding" msgstr "Veuillez spécifier l'encodage des caractères" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 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:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5196,8 +5208,8 @@ "L'hôte du réseau n'a aucunes adresses réseau dans la famille d'adresses " "requise" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Réseau inaccessible" @@ -5213,7 +5225,7 @@ msgid "New &tab" msgstr "Nouvel ongle&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 "Nouveau Fa&vori" @@ -5233,13 +5245,13 @@ #: ../../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/sitemanager_dialog.cpp:2183 msgid "New bookmark" msgstr "Nouveau Favori" -#: ../../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 "Nouveau dossier" @@ -5258,7 +5270,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:585 #: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Nouveau site" @@ -5266,11 +5278,11 @@ msgid "Next to the transfer queue" msgstr "À côté de la file d'attente" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Non" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Aucune adresse associée à ce nom de nœud" @@ -5278,11 +5290,11 @@ msgid "No category to export selected" msgstr "Aucune catégorie sélectionnée pour l'exportation" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Aucune commande spécifiée, abandon." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "" "Aucune adresse IP externe spécifiée, utilisation des paramètres par défaut." @@ -5305,27 +5317,27 @@ msgid "No images available" msgstr "Aucune image disponible" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../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: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 "Le jeu de filtres spécifié n'a aucun nom." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Aucun programme associé à ce type de fichier" -#: ../../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 "" "Aucun programme n'a été associé pour éditer les fichiers portant l'extension " "'%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Aucun routage vers l'hôte" @@ -5337,7 +5349,7 @@ msgid "No sites available" msgstr "Aucun site disponible" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Méthode d'authentification SOCKS5 non supportée" @@ -5355,18 +5367,18 @@ msgid "None selected yet" msgstr "Pas encore sélectionné" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Normale" @@ -5378,16 +5390,16 @@ "Tous les objets ne peuvent pas être replacés en file d'attente pour le " "transfert." -#: ../../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 "Déconnecté" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Absence de connexion à un serveur" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Absence de connexion à un serveur." @@ -5395,11 +5407,11 @@ msgid "Not connected." msgstr "Déconnecté." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Non initialisé, vous devez appeler WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Notez que cette fonctionnalité est uniquement supportée avec le protocole " @@ -5445,13 +5457,13 @@ #: ../../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" @@ -5470,7 +5482,7 @@ "sélectionner sera configuré de même que le mode alternatif si vous l'avez " "activé." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Une seule fois" @@ -5517,8 +5529,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 "L'ouverture a échoué" @@ -5541,19 +5553,19 @@ msgid "Operating System:" msgstr "Système d'exploitation :" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Opération déjà en cours" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Opération en cours" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Opération non supportée" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisation :" @@ -5561,16 +5573,16 @@ msgid "Other SFTP options" msgstr "Autres options SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Autre erreur du système" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Autre :" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Mémoire insuffisante" @@ -5621,7 +5633,7 @@ msgstr "" "Remplacer si la taille est différente ou si la &source est plus récente" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Type de compilation reconnu : %s\n" @@ -5648,7 +5660,7 @@ msgid "P&roxy host:" msgstr "Hôte P&roxy :" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "La commande PORT a été corrompue par le routeur ou le pare-feu." @@ -5656,11 +5668,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssif (recommandé)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Le paramètre n'est pas une URL invalide" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analyse de %d octets de l'information de version.\n" @@ -5680,13 +5692,13 @@ msgid "Passive mode" msgstr "Mode passif" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../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 "Le mode passif a été défini comme mode de transfert par défaut." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Mot de passe requis" @@ -5695,14 +5707,14 @@ msgid "Path" msgstr "Chemin" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../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 "" "Le chemin ne peut pas être créé pour le dossier %s et le sous-dossier %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Chemin introuvable :" @@ -5721,8 +5733,8 @@ msgid "Permission" msgstr "Droit d'accès" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Autorisation refusée" @@ -5735,7 +5747,7 @@ msgid "Platform:" msgstr "Plateforme :" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../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." @@ -5751,11 +5763,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:578 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5791,7 +5803,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Saisissez un nouveau nom pour le filtre copié." -#: ../../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 "Saisissez un nouveau nom pour le jeu de filtres \"%s\"" @@ -5827,7 +5839,7 @@ msgid "Please enter a password for this server:" msgstr "Saisissez un mot de passe pour ce serveur :" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5844,7 +5856,7 @@ "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:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Saisissez un nom unique pour ce jeu de filtres" @@ -5852,11 +5864,11 @@ msgid "Please enter a username for this server:" msgstr "Saisissez un identifiant pour ce serveur :" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Saisissez une plage de ports valide." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "" "Saisissez une URL à partir de laquelle vous obtiendrez votre adresse externe" @@ -5867,7 +5879,7 @@ 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:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5875,14 +5887,14 @@ "Saisissez une commande FTP brute.\n" "L'utilisation de commandes FTP brutes vide le cache du dossier." -#: ../../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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Saisissez le nom du fichier que vous souhaitez créer :" @@ -5890,12 +5902,12 @@ 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:158 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Saisissez votre adresse IP externe" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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 " @@ -5914,7 +5926,7 @@ "Suivez les instructions attentivement, car une mauvaise configuration " "empêchera les connexions FTP d'aboutir." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../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." @@ -5923,11 +5935,11 @@ "et que vous avez correctement saisi l'adresse nécessaire à la résolution des " "adresses." -#: ../../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 "Assurez-vous que la requête locale est installée sur votre système." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../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 " @@ -5952,7 +5964,7 @@ "autres logiciels malveillants. Ce comportement peut engendrer une fausse " "alerte que vous pouvez ignorer sans risque." -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../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." @@ -5969,7 +5981,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:586 +#: ../../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 " @@ -5979,7 +5991,7 @@ "une modification ou si vous rencontrez des problèmes avec des serveurs qui " "fonctionnaient parfaitement auparavant." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Sélectionnez une action :" @@ -6017,7 +6029,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:597 +#: ../../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. " @@ -6036,8 +6048,8 @@ msgid "Positio&n of the message log:" msgstr "Positio&n du journal des événements :" -#: ../../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 "Code postal :" @@ -6050,11 +6062,11 @@ msgstr "Préallocation" #: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Sites prédéfinis" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Préserver l'horodatage des fichiers" @@ -6062,7 +6074,7 @@ msgid "Preview:" msgstr "Aperçu :" -#: ../../locales/../src/engine/tlssocket.cpp:1112 +#: ../../locales/../src/engine/tlssocket.cpp:1136 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 " @@ -6081,7 +6093,7 @@ msgid "Prioritize directories (default)" msgstr "Priorité aux dossiers (par défaut)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Priorité" @@ -6112,7 +6124,7 @@ msgid "Process &Queue" msgstr "Traiter la fi&le d'attente" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Débordement de la table de fichiers du processus" @@ -6122,11 +6134,11 @@ msgid "Processed %s in %s." msgstr "Traitement de %s dans %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protocole non supporté" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protocole non supporté étant donné le type de socket" @@ -6143,7 +6155,7 @@ msgid "Proxy &user:" msgstr "&Identifiant Proxy :" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Échec de l'authentification au Proxy" @@ -6153,29 +6165,33 @@ msgid "Proxy handshake failed: %s" msgstr "Échec de la négociation avec le Proxy : %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Réponse du Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" msgstr "Échec de la requête au Proxy : %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4241 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy spécifié mais le Proxy hôte ou le port sont invalides" @@ -6191,7 +6207,7 @@ msgid "Public permissions" msgstr "Permissions publiques" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "La file d'attente a été complètement traitée" @@ -6210,11 +6226,11 @@ msgid "Queue: empty" msgstr "File d'attente : vide" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Fichiers en file d'attente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "File d'attente :" @@ -6232,7 +6248,7 @@ msgstr "" "Réinitialis&er et replacer les fichiers sélectionnés dans la file d'attente" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Commande FTP brute" @@ -6249,7 +6265,7 @@ msgid "Re&name" msgstr "Re&nommer" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6265,12 +6281,12 @@ msgid "Read-only" msgstr "Lecture seule" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Souhaitez-vous vraiment annuler l'opération en cours ?" -#: ../../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 "" @@ -6280,37 +6296,37 @@ msgstr[1] "" "Voulez-vous vraiment supprimer %d dossiers et leurs contenus du serveur ?" -#: ../../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] "Voulez-vous vraiment supprimer %d fichier du serveur ?" msgstr[1] "Voulez-vous vraiment supprimer %d fichiers du serveur ?" -#: ../../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 "Voulez-vous vraiment supprimer %s et %s du serveur ?" -#: ../../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 "" "Voulez-vous vraiment supprimer tous les fichiers et/ou dossiers sélectionnés " "du serveur ?" -#: ../../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 "" "Voulez-vous vraiment supprimer tous les fichiers et/ou dossiers sélectionnés " "de votre ordinateur ?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Raison" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Redémarrer maintenant" @@ -6318,36 +6334,36 @@ msgid "Rec&urse into subdirectories" msgstr "Réc&ursion dans les sous-dossiers" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, 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:2958 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 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:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Données reçues corrompues" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 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:204 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Réception de l'information de version trop grande" @@ -6381,13 +6397,13 @@ msgid "Recursively deleting files and directories." msgstr "Suppression récursive des fichiers et des dossiers." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Redirection vers une adresse invalide ou non supportée : %s" @@ -6397,7 +6413,7 @@ msgid "Refresh the file and folder lists" msgstr "Actualiser la liste des dossiers et des fichiers" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Se souvenir des mots de passe?" @@ -6405,20 +6421,20 @@ msgid "Remote" msgstr "Distant" -#: ../../locales/../src/engine/tlssocket.cpp:830 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Certificat distant non approuvé." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Fichier distant" -#: ../../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 "Recherche de fichiers distants" @@ -6457,11 +6473,11 @@ "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu " "est valide." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 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:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Traitement du chemin distant :" @@ -6501,30 +6517,30 @@ msgid "Rename selected files and directories" msgstr "Renommer les fichiers et dossiers sélectionnés" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Changement du nom de '%s' en '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Rapporter des bogues et demander des améliorations" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Échec ou rejet de la requête" @@ -6540,28 +6556,28 @@ msgid "Reset and requeue &all" msgstr "Réiniti&aliser et replacer tous les fichiers dans la file d'attente" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Le protocole résolu est inconnu" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../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 "Résolution de l'adresse de %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Ressources temporairement indisponibles" -#: ../../locales/../src/engine/logging.cpp:112 +#: ../../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 "Réponse :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Résultats :" @@ -6580,19 +6596,19 @@ "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:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Récupération du contenu du dossier \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Récupération du contenu du dossier..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Récupération de l'adresse IP externe depuis %s" @@ -6609,7 +6625,7 @@ msgid "S&hutdown system" msgstr "Arrêter l'&ordinateur" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "Arrê&ter" @@ -6629,7 +6645,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Le proxy SOCKS 4 se connecte à : %s" @@ -6638,34 +6654,34 @@ msgid "SQLite:" msgstr "SQLite :" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Sauvegarder les paramètres ?" -#: ../../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 "" "La sauvegarde des mots de passe a été désactivée par votre administrateur." -#: ../../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 "Vous avez désactivé la sauvegarde des mots de passe." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../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:1712 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "Examen des fichiers à envoyer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Conditions de recherche :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Chemin &de recherche :" @@ -6681,8 +6697,8 @@ msgid "Security information" msgstr "Information de sécurité" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Voir aussi : https://wiki.filezilla-project.org/Network_Configuration" @@ -6735,7 +6751,7 @@ msgstr "Sélection du fichier pour l'exportation des données" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Sélection du fichier pour l'exportation de la file d'attente" @@ -6744,7 +6760,7 @@ msgstr "Sélection du fichier pour l'exportation des paramètres" #: ../../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 "Sélection du fichier pour l'exportation des sites" @@ -6752,23 +6768,23 @@ msgid "Select file to import settings from" msgstr "Sélection du fichier pour l'importation des paramètres" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Sélection du fichier à envoyer" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 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:2907 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 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:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Sélectionner le dossier cible du téléchargement" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Sélection du nom de fichier cible" @@ -6780,7 +6796,7 @@ 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: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." @@ -6794,7 +6810,7 @@ msgstr[0] "Sélection de %d dossier." msgstr[1] "Sélection de %d dossiers." -#: ../../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." @@ -6815,7 +6831,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s et %s sélectionnés pour le transfert." @@ -6853,7 +6869,7 @@ msgid "Selected file is still being edited" msgstr "Le fichier sélectionné est encore en cours d'édition" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Le filtre sélectionné fonctionne uniquement pour les fichiers locaux." @@ -6879,12 +6895,12 @@ msgstr "" "Envoi d'une commande personnalisée au serveur si celui-ci est indisponible" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Numéro de série :" @@ -6892,23 +6908,23 @@ msgid "Server &Type:" msgstr "&Type de serveur :" -#: ../../locales/../src/engine/tlssocket.cpp:719 +#: ../../locales/../src/engine/tlssocket.cpp:743 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:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Le serveur ne supporte pas les caractères non-ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6918,17 +6934,17 @@ "Gio. Fin du transfert dès que la taille des fichiers en local et sur le " "serveur sont identiques." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 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:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 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:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6938,7 +6954,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:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6946,11 +6962,11 @@ "Le serveur requiert un compte. Essayez de spécifier un compte en utilisant " "le Gestionnaire de Sites" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Le serveur a retourné aucun chemin." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6958,13 +6974,13 @@ "Le serveur a envoyé une requête d'identification additionnelle. Vous devez " "utiliser un type d'identification interactif." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6972,15 +6988,15 @@ "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: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: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:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:519 +#: ../../locales/../src/interface/netconfwizard.cpp:530 msgid "Server sent unexpected reply." msgstr "Le serveur a envoyé une réponse inattendue." @@ -6996,7 +7012,7 @@ msgid "Server&type:" msgstr "&Type de serveur :" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Serveur / Fichier local" @@ -7013,13 +7029,13 @@ msgid "Set &Priority" msgstr "Définir la &priorité" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Définir les permissions de '%s' à '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:791 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize appellé sans socket" @@ -7039,7 +7055,7 @@ msgid "Show &welcome dialog..." msgstr "Afficher le dialogue de &bienvenue..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Afficher les arborescences des 2 côtés et continuer la comparaison ?" @@ -7061,7 +7077,7 @@ msgid "Shows this help dialog" msgstr "Afficher ce dialogue d'aide" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Arrêter maintenant" @@ -7136,7 +7152,7 @@ "le Gestionnaire de Sites.\n" "Ajouter les paramètres de la connexion actuelle au Gestionnaire de Sites ?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Taille" @@ -7155,43 +7171,43 @@ msgid "Skip file" msgstr "Ignorer le fichier" -#: ../../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: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 "Ignorer le téléchargement 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/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 "Ignorer l'envoi de %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "L'adresse du socket est extérieure à l'espace d'adressage" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket déjà connecté" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Le socket a été fermé" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket déconnecté" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Type de socket non supporté pour la famille d'adresses" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 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 " @@ -7210,7 +7226,7 @@ msgid "Sort directories inline" msgstr "Trier les dossiers en ligne" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "L'ordre de tri ne peut pas être modifié pendant la comparaison des dossiers." @@ -7228,7 +7244,7 @@ msgstr "" "La source et le chemin pour l'opération de glisser-déposer sont identiques" -#: ../../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 "La source et la cible du fichier ne peuvent être identiques" @@ -7241,7 +7257,7 @@ msgid "Source file:" msgstr "Fichier source :" -#: ../../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" @@ -7281,19 +7297,19 @@ msgid "Start with opened Site Manager" msgstr "Démarrer avec l'ouverture du Gestionnaire de Sites" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, 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:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Démarrage du téléchargement de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Démarrage de l'envoi de %s" @@ -7302,16 +7318,16 @@ 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:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "État ou province :" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Statut" -#: ../../locales/../src/engine/logging.cpp:109 +#: ../../locales/../src/engine/logging.cpp:110 #: ../../locales/../src/interface/StatusView.cpp:295 #: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" @@ -7325,7 +7341,7 @@ msgid "Stop recursive operation" msgstr "Arrêt de l'opération récursive" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Rue :" @@ -7341,11 +7357,11 @@ msgid "Summary of test results:" msgstr "Résumé des résultats du test :" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Mise en veille immédiate" -#: ../../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." @@ -7353,24 +7369,24 @@ "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: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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Navigation synchronisée" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "La navigation synchronisée a été désactivée." @@ -7384,8 +7400,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Erreur de syntaxe dans la ligne de commande" @@ -7397,11 +7413,11 @@ msgid "System details" msgstr "Détails du système" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 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:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Le sous-système réseau du système a échoué" @@ -7409,19 +7425,19 @@ msgid "T&oolbar" msgstr "Barre d'&outils" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Connexion TLS établie, envoi d'une requête HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "Connexion TLS établie, attente du message d'accueil..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Connexion TLS établie." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL expiré" @@ -7433,15 +7449,15 @@ msgid "Target file:" msgstr "Fichier cible :" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Le fichier cible existe déjà !" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Le fichier cible existe déjà, souhaitez-vous vraiment continuer ?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Échec temporaire dans la résolution du nom" @@ -7449,7 +7465,7 @@ msgid "Test results" msgstr "Résultats du test" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Test de la capacité du serveur à reprendre les transferts" @@ -7477,16 +7493,16 @@ "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:634 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "L'adresse que vous avez saisie est : %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 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:1101 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "Le membre ai_socktype n'est pas supporté" @@ -7526,12 +7542,12 @@ 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: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 "L'éditeur par défaut pour les fichiers texte est introuvable." -#: ../../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 "L'éditeur par défaut pour les fichiers texte est '%s'." @@ -7543,7 +7559,7 @@ msgstr "" "Le nom du filtre que vous avez saisi existe déjà. Saisissez un autre nom." -#: ../../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 "L'extension '%s' est déjà présente dans la liste" @@ -7559,7 +7575,7 @@ "Saisissez un nouveau nom :" #: ../../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" @@ -7591,7 +7607,7 @@ msgstr "Le fichier '%s' ne peut pas être chargé." #: ../../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" @@ -7601,7 +7617,7 @@ "Aucun programme n'est associé à ce type de fichier sur votre système" #: ../../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" @@ -7623,7 +7639,7 @@ "entraîner la perte de données.\n" "Souhaitez-vous continuer ?" -#: ../../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" @@ -7672,7 +7688,7 @@ msgid "The following files are currently being edited:" msgstr "Les fichiers suivants sont en cours d'édition :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "La solution FTP libre et Open Source" @@ -7694,17 +7710,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, 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:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Le dossier local '%s' n'existe pas." -#: ../../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" @@ -7714,7 +7730,7 @@ "Désactiver la navigation synchronisée et continuer le changement de dossier " "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." @@ -7731,16 +7747,16 @@ msgstr "" "La nouvelle version a été enregistré dans votre dossier de téléchargement." -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "La file d'attente ne peut pas être sauvegardée." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Le dossier distant '%s' n'existe pas." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7787,7 +7803,7 @@ msgid "The server could not be added." msgstr "Le serveur ne peut pas être ajouté." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Le serveur a envoyé une réponse inattendue ou non reconnue." @@ -7823,7 +7839,7 @@ "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:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Le paramètre nom du serveur n'est pas supporté pour ai_socktype" @@ -7835,20 +7851,20 @@ "Les paramètres ont été importé. Vous devez redémarrer FileZilla pour que " "ceux-ci prennent effet." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 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:1113 +#: ../../locales/../src/engine/socket.cpp:1099 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:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 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." @@ -7861,7 +7877,7 @@ "Le fichier cible existe déjà.\n" "Choisissez une action." -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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 ?" @@ -7874,15 +7890,15 @@ msgid "Themes" msgstr "Thèmes" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Ce jeu de filtres ne peut pas être supprimé." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Ce jeu de filtres ne peut pas être renommé." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7905,7 +7921,7 @@ "Cet assistant va vous aider à configurer correctement vos routeurs et pare-" "feux et permettre ensuite de tester votre configuration." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Temps" @@ -7918,27 +7934,27 @@ msgstr "Délai d'attente en sec&ondes :" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Délai d'attente" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 +#: ../../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:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titre :" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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 " @@ -8004,15 +8020,15 @@ msgid "Toggles the display of the transfer queue" msgstr "Afficher ou masquer la file d'attente" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Ligne d'en-tête trop longue" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Trop de redirections" -#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/engine/logging.cpp:114 #: ../../locales/../src/interface/StatusView.cpp:289 #: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" @@ -8049,11 +8065,11 @@ msgid "Transfer connection interrupted: %s" msgstr "Connexion interrompue : %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Les données transferrées ont été corrompues." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Transfert en cours" @@ -8062,8 +8078,7 @@ msgid "Transfers" msgstr "Transferts" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Transferts réussis" @@ -8075,11 +8090,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Traiter les types de &fichiers suivants comme des fichiers ASCII :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Approbation du changement de la clé de l'hôte :" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Approbation de la nouvelle clé de l'hôte :" @@ -8117,7 +8132,7 @@ msgid "U&pload" msgstr "E&nvoyer" -#: ../../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 "Limite de l'&envoi :" @@ -8127,20 +8142,20 @@ msgstr "Utili&ser l'association par type de fichier si elle est disponible" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Utili&ser les paramètres par défaut du système" +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 msgid "USER@&HOST" msgstr "UTILISATEUR@&HÔTE" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Code d'erreur non affecté %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Unité :" @@ -8149,13 +8164,13 @@ msgid "Unknown" msgstr "Inconnu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Version du protocole SOCKS inconnue : %d" @@ -8168,7 +8183,7 @@ msgid "Unknown host key" msgstr "Clé de l'hôte inconnue" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8184,8 +8199,8 @@ "Élément inconnu à la racine, il semblerait que ce fichier n'ait pas été " "généré par FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../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." @@ -8193,7 +8208,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:599 +#: ../../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." @@ -8201,11 +8216,11 @@ "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:1074 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Type de certificat non supporté" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Redirection non supportée" @@ -8275,12 +8290,12 @@ msgid "Use &custom editor:" msgstr "Utiliser l'éditeur pers&onnalisé :" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Utiliser la navigation &synchronisée" @@ -8308,8 +8323,8 @@ msgstr "Utiliser le serveur défini dans le Gestionnaire de Sites" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Utiliser les paramètres par &défaut du système" +msgid "Use system &defaults for current language" +msgstr "Utiliser la langue du système par &défaut" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8346,7 +8361,7 @@ msgid "User:" msgstr "Identifiant :" -#: ../../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 "L'identifiant ne peut pas être une série d'espaces" @@ -8370,7 +8385,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Détailler les historiques d'événements depuis wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1124 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Vérification du certificat..." @@ -8378,7 +8393,7 @@ msgid "Very high" msgstr "Très haute" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 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 " @@ -8396,15 +8411,15 @@ msgid "W&rite" msgstr "Éc&rire" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "En attente" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Attente d'une connexion pour la navigation" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Attente du mot de passe" @@ -8416,7 +8431,7 @@ msgid "Waiting to retry..." msgstr "Attente avant nouvel essai..." -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "" "Attention, données de connexion ignorées en provenance d'une IP incorrecte." @@ -8441,11 +8456,11 @@ msgid "Warning: Potential security breach!" msgstr "Attention : Faille de sécurité potentielle !" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Bienvenue sur FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Quoi de neuf ?" @@ -8453,7 +8468,7 @@ msgid "What's new:" msgstr "Quoi de neuf :" -#: ../../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." @@ -8480,7 +8495,7 @@ msgid "Widescreen" msgstr "Écran large" -#: ../../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 "Autorisez-vous FileZilla à se souvenir de vos mots de passe?" @@ -8488,20 +8503,20 @@ msgid "Wr&ite" msgstr "Écr&ire" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Adresse IP externe incorrecte" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Fins de ligne incorrectes" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Oui" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8513,7 +8528,7 @@ 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:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 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 (?)." @@ -8556,12 +8571,12 @@ msgstr "" "Vous n'avez pas saisi de nouveau nom pour le fichier. Remplacer le fichier ?" -#: ../../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 "Vous avez sélectionné au moins un lien symbolique." #: ../../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?" @@ -8569,7 +8584,7 @@ "Vous avez sélectionné plus de 10 fichiers pour l'édition, souhaitez-vous " "vraiment continuer ?" -#: ../../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?" @@ -8577,7 +8592,7 @@ "Vous avez sélectionné plus de 10 fichiers ou dossiers à ouvrir, souhaitez-" "vous vraiment continuer ?" -#: ../../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 "Vous devez saisir un nom d'hôte." @@ -8586,30 +8601,30 @@ msgid "You have to enter a key file path" msgstr "Vous devez saisir un chemin de destination pour le fichier de clé." -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Vous devez saisir un dossier 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 "Vous devez saisir une adresse IP valide." +#: ../../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 "Vous devez saisir une adresse IPv4 valide." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 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:505 +#: ../../locales/../src/interface/manual_transfer.cpp:506 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "Vous devez saisir un nom de compte" -#: ../../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 "Vous devez spécifier un identifiant" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8664,23 +8679,23 @@ "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:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Vous devez spécifier un fichier local." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Vous devez spécifier un fichier distant." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Vous devez spécifier un chemin distant." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Vous devez spécifier un serveur." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8688,7 +8703,7 @@ "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:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Votre ordinateur va se mettre en veille à moins que vous ne cliquiez sur " @@ -8715,7 +8730,7 @@ msgid "contains" msgstr "qui contient" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "personnalisé" @@ -8737,19 +8752,19 @@ msgid "equals" msgstr "qui est égale à" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "fichier" -#: ../../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 " @@ -8759,15 +8774,15 @@ "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:467 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartient à une autre version de FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp n'a pas pu être démarré" -#: ../../locales/../src/engine/tlssocket.cpp:1103 +#: ../../locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers n'a retourné aucun certificat" @@ -8823,10 +8838,10 @@ msgid "owner writeable" msgstr "écriture par le propriétaire" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1167 -#: ../../locales/../src/engine/tlssocket.cpp:1178 -#: ../../locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 "inconnu" @@ -8846,3 +8861,6 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets :" + +#~ msgid "Empty dirs to visit" +#~ msgstr "Dossiers vides à visiter" diff -Nru filezilla-3.14.1/locales/hy.po filezilla-3.15.0.2/locales/hy.po --- filezilla-3.14.1/locales/hy.po 2015-07-30 10:04:18.000000000 +0000 +++ filezilla-3.15.0.2/locales/hy.po 2016-02-05 08:54:45.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: Հայերեն թարգմանություն\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-30 12:00+0200\n" -"PO-Revision-Date: 2015-07-27 10:53+0400\n" +"POT-Creation-Date: 2016-01-13 13:13+0100\n" +"PO-Revision-Date: 2015-12-03 11:27+0400\n" "Last-Translator: Hrant Ohanyan \n" "Language-Team: Hrant Ohanyan \n" "Language: hy\n" @@ -15,7 +15,7 @@ "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.7.3\n" +"X-Generator: Poedit 1.8.6\n" "X-Poedit-Bookmarks: -1,240,-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 @@ -36,8 +36,8 @@ "%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 @@ -48,9 +48,9 @@ msgstr[0] "%d թղթապանակ" msgstr[1] "%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" @@ -59,9 +59,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" @@ -82,12 +82,12 @@ msgstr[0] "%d ֆայլ։ Ընդհանուր չափը՝ ոչ քիչ քան %s" msgstr[1] "%d ֆայլեր։ Ընդհանուր չափը՝ ոչ քիչ քան %s" -#: ../../locales/../src/interface/QueueView.cpp:2784 +#: ../../locales/../src/interface/QueueView.cpp:2778 #, 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" @@ -98,14 +98,14 @@ msgid "%h - Host" msgstr "%h - Հոսթը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:88 +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 #, c-format msgid "%llu directory" msgid_plural "%llu directories" msgstr[0] "%llu թղթապանակ" msgstr[1] "%llu թղթապանակ" -#: ../../locales/../src/interface/recursive_operation_status.cpp:87 +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -127,7 +127,7 @@ msgid "%s (? B/s)" msgstr "%s (Բ/վ)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Սերտիֆիկատը սխալ է։" @@ -140,7 +140,7 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:532 #, c-format msgid "%s - Proxy user" -msgstr "%s - Միջնորդ սպասարկիչ" +msgstr "%s - Պրոքսիի օգտվող" #: ../../locales/../src/interface/filelist_statusbar.cpp:72 #, c-format @@ -159,7 +159,7 @@ msgstr[0] "%s բայթ" msgstr[1] "%s բայթ" -#: ../../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 " @@ -172,7 +172,7 @@ "\n" "Կրկին բեռնեք ծրագիրը և տեղակայեք։" -#: ../../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 " @@ -186,9 +186,9 @@ "\n" "Լուծումներ.\n" "-Համոզվեք, որ %s-ը գտնվում է այն թղթապանակում, որը նշված է PATH-ում։\n" -"-Նշեք %s-ի ամբողջական ճանապարհը՝ FZ_FZSFTP։" +"-Նշեք %s-ի ամբողջական ուղին՝ FZ_FZSFTP։" -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s %d բիթ" @@ -200,9 +200,9 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:540 msgid "%w - Proxy password" -msgstr "%w - Միջնորդի գաղտնաբառը" +msgstr "%w - Պրոքսիի գաղտնաբառը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Ընդհատել նախորդ կապակցումը և կապակցել այս պատուհանում" @@ -210,14 +210,14 @@ msgid "&About..." msgstr "&Ծրագրի մասին..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 -#: ../../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 "&Գործածողը." +msgstr "&Հաշիվ." #: ../../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/sitemanager.xrc:448 msgid "&Active" msgstr "&Ակտիվ" @@ -231,15 +231,15 @@ msgstr "&Ավելացնել ֆայլեր" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Ավելացնել ֆայլեր keyfile-ով..." +msgid "&Add key file..." +msgstr "&Ավելացնել բանալի ֆայլ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" -msgstr "&Ավելացնել հերթում" +msgstr "&Ավելացնել հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:335 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "&Կիրառել սպասարկիչի ժամանակավոր գոտու կարգավորումները." @@ -255,7 +255,7 @@ msgid "&Always use default editor" msgstr "&Միշտ օգտագործել ծրագրային խմբագիրը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2947 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Միշտ օգտագործել չասոցացված ֆայլերի համար" @@ -269,17 +269,17 @@ "&Ստանալ տեղեկություններ արտաքին IP հասցեի մասին՝ համակարգի կարգավորումներում" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Ինքնա" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:468 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 msgid "&Autodetect" msgstr "&Ինքնորոշում" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Կրկնակի" @@ -293,14 +293,14 @@ msgid "&Bookmarks" msgstr "&Էջանիշներ" -#: ../../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/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:295 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 msgid "&Browse..." msgstr "&Դիտել..." @@ -310,8 +310,8 @@ #: ../../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: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" @@ -329,7 +329,7 @@ msgid "&Close FileZilla" msgstr "&Փակել FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Կարգավորել արագության սահմանափակումները..." @@ -337,7 +337,7 @@ msgid "&Configure..." msgstr "&Կարգավորել..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:547 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "&Կապակցել" @@ -346,18 +346,18 @@ msgstr "&Պատճենել գործող կապակցումները Կայքերի կառավարիչում..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 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:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 msgid "&Create directory" msgstr "&Ստեղծել թղթապանակ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "&Ստեղծել նոր պատուհան" @@ -384,14 +384,14 @@ #: ../../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/dialogs.xrc:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Ջնջել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Ջնջել նշան-հղումը" @@ -399,6 +399,18 @@ msgid "&Directory comparison" msgstr "&Համեմատել բաժինները" +#: ../../locales/../src/interface/state.cpp:887 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Անջատե՞լ համաժամանակեցված դիտումը և շարունակել տեղային թղթապանակի փոփոխումը" + +#: ../../locales/../src/interface/state.cpp:960 +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 "&Մերժել համակարգչի ֆայլը, բեռնել այն և վերականգնել խմբագրումը" @@ -419,7 +431,7 @@ msgid "&Display size in bytes" msgstr "&Ցուցադրել ֆայլի չափը բայթերով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Չհիշել գաղտնաբառերը" @@ -436,15 +448,15 @@ msgstr "&Գործողություն՝ մկնիկի կրկնակի սեղմամբ." #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "&Բեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3105 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Բեռնել." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "&Բեռնում..." @@ -460,12 +472,12 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 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:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" msgstr "&Միացնել" @@ -473,12 +485,12 @@ msgid "&Enable compression" msgstr "&Միացնել սեղմումը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3538 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Միացնել արագության սահմանափակումները" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:493 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "&Կոդավորումը." @@ -486,11 +498,11 @@ msgid "&Encryption:" msgstr "&Կոդավորումը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "&Պատահական հրաման..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Կապ հաստատել նոր պատուհանում" @@ -500,12 +512,12 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "&Export Site Manager entries" -msgstr "&Արտածել Կայքերի կառավարիչի գրառումները" +msgstr "&Արտահանել Կայքերի կառավարիչի գրառումները" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." -msgstr "&Արտածել..." +msgstr "&Արտահանել..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:426 msgid "&Fall back to active mode" @@ -515,7 +527,7 @@ msgid "&File" msgstr "&Ֆայլ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Ֆայլի հատկությունները..." @@ -523,35 +535,35 @@ msgid "&File permissions..." msgstr "&Ֆայլի թույլտվությունները ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Ֆայլ." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" -msgstr "&Ֆիլտրի պայմանները." +msgstr "&Զտիչի պայմաններ." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" -msgstr "&Ֆիլտրերը." +msgstr "&Զտիչներ." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" -msgstr "&Ֆիլտրեր." +msgstr "&Զտիչներ." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" msgstr "&Ավարտել խմբագրումը և ջնջել ֆայլը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3141 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" msgstr "" -"&Հարթեցրեք հեռակա ճանապարհները, բեռնեք բոլոր պարունակող ֆայլերը միանգամից " +"&Հարթեցրեք հեռակա ուղիները, ներբեռնեք բոլոր պարունակող ֆայլերը միանգամից " "հիմնական թղթապանակում։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Հետևելով հղում-նշանին ջնջել թղթապանակի պարունակությունը" @@ -563,7 +575,7 @@ msgid "&Getting help..." msgstr "&Ստանալ օգնություն..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Ընդհանուր էջանիշ" @@ -576,7 +588,7 @@ msgstr "&Օգնություն" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Թաքցնել նույնանման ֆայլերը" @@ -588,7 +600,7 @@ msgid "&Highest available port:" msgstr "&Հասանելի ամենաբարձր պորտը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2385 +#: ../../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:" @@ -614,9 +626,13 @@ msgid "&Install new version" msgstr "&Տեղակայել նոր տարբերակը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" -msgstr "&Թողեք հեռակա ճանապարհների կառուցվածքը՝ փնտրման խորքի համար" +msgstr "&Թողնել հեռակա ուղիների կառուցվածքը՝ հարաբերական որոնման համար" + +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "&Բանալի ֆայլ" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" @@ -626,7 +642,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Սահմանափակել տեղային պորտերի օգտագործումը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "&Սահմանափակել միաժամանակյա կապակցումները" @@ -634,8 +650,8 @@ msgid "&Local directory tree" msgstr "&Համակարգչի ֆայլերի &ցանկը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2727 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "&Համակարգչային թղթապանակներ." @@ -643,11 +659,11 @@ msgid "&Log to file" msgstr "&Կատարել գրառում" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Մուտքի եղանակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Մուտքի եղանակը." @@ -663,7 +679,7 @@ msgid "&Manual transfer..." msgstr "&Ձեռադիր փոխանցում..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:432 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "&Կապուղիների մաքս. քանակը." @@ -683,7 +699,7 @@ msgid "&Name sorting mode:" msgstr "Խմբավորելու &եղանակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Անունը." @@ -699,11 +715,11 @@ msgid "&New Site" msgstr "&Նոր կայք" -#: ../../locales/../src/interface/Mainfrm.cpp:1708 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Հասանելի է նոր տարբերակը:" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Առաջ »" @@ -726,8 +742,8 @@ msgstr "&Համարային նշանակում." #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&ԼԱՎ" @@ -736,15 +752,15 @@ msgstr "&ԲԱՑԵԼ" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" msgstr "&Բացել" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" -msgstr "&Վերագրել" +msgstr "&Վրագրել" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:413 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Պասիվ" @@ -756,7 +772,7 @@ msgid "&Play sound" msgstr "&Վերարտադրել ձայն" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2398 +#: ../../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:" @@ -768,7 +784,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" -msgstr "&Առաջադրանք" +msgstr "&Հերթականություն" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" @@ -795,7 +811,7 @@ msgstr "&Վերակապակցումների տեղեկություն" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" msgstr "&Թարմացնել" @@ -803,18 +819,18 @@ msgid "&Remember password until FileZilla is closed" msgstr "FileZilla-ն փակելուց առաջ &հիշել գաղտնաբառը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3643 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Հիշել գաղտնաբառերը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" -msgstr "&Հեռադիր թղթապանակը." +msgstr "&Հեռակա թղթապանակ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" -msgstr "&Հեռադիր ճանապարհը." +msgstr "&Հեռակա ուղի." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" @@ -829,18 +845,18 @@ msgstr "&Ջնջել ընտրվածը" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2813 +#: ../../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:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../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 "&Անվանափոխել" +msgstr "&Վերանվանել" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." -msgstr "&Անվանափոխել..." +msgstr "&Վերանվանել..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" @@ -854,9 +870,9 @@ msgid "&Report a bug..." msgstr "&Հաղորդել սխալի մասին..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" -msgstr "&Ետարկել և վերականգնել ֆայլերը հերթում" +msgstr "&Վերակայել և վերականգնել ֆայլերը հերթում" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:428 msgid "&Restart Wizard" @@ -890,7 +906,7 @@ msgid "&Save as..." msgstr "&Պահպանել որպես..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Փնտրել" @@ -906,11 +922,11 @@ msgid "&Select language:" msgstr "&Ընտրել ծրագրի լեզուն." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "&Ընտրեք ցուցադրվող սյուները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Սպասարկիչը" @@ -927,7 +943,7 @@ msgid "&Show debug menu" msgstr "&Ցուցադրել վրիպազերծման ընտրացանկը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "&Մանրամասներ" @@ -947,7 +963,7 @@ msgid "&Site Manager..." msgstr "&Կայքերի կառավարիչ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Որոշված էջանիշ" @@ -959,7 +975,7 @@ msgid "&Speed limits" msgstr "&Արագության սահմանափակում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Սկսել փոխանցումը" @@ -967,11 +983,11 @@ msgid "&Swap local and remote panes" msgstr "&Տեղ-տեղ փոխել վահանակները" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "&TLS չիպերներ" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Թեստ" @@ -983,14 +999,14 @@ msgid "&Transfer" msgstr "&Փոխանցումներ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:389 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "&Փոխանցման եղանակը." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" -msgstr "&Առաջադրանքի պատուհանը" +msgstr "&Փոխանցման հերթականություն" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" @@ -1005,7 +1021,7 @@ msgstr "&Թարմացնել գրանցատեղի բանալին այս հոսթի համար" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Վերբեռնել" @@ -1014,11 +1030,11 @@ msgid "&Uploads:" msgstr "&Վերբեռնումներ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Օգտագործել ընտրված ծրագիր" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "&Օգտագործել համաժամանակեցված դիտումը" @@ -1039,8 +1055,8 @@ msgstr "&Օգտագործել բաժանիչ" #: ../../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:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Օգտատերը." @@ -1048,7 +1064,7 @@ msgid "&Username:" msgstr "&Օգտատերի անունը." -#: ../../locales/../src/interface/Mainfrm.cpp:1702 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Տարբերակ %s" @@ -1058,7 +1074,7 @@ msgstr "&Տեսք" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Դիտել/Խմբագրել" @@ -1079,41 +1095,40 @@ msgid "&Yes" msgstr "&Այո" -#: ../../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' գոյություն չունի կամ անհասանելի է։" -#: ../../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' թղթապանակ չէ" -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:951 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" -msgstr "'Գործածող' եղանակով մուտք չի աջակցվում։" +msgstr "'Հաշիվը' եղանակով մուտք չի աջակցվում։" -#: ../../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." msgstr "" -"'Նորմալ' և 'Գործածողը' եղանակները հասանելի չեն: Փոխարենը օգտագործեք 'Հարցնել " +"'Նորմալ' և 'Հաշիվը' եղանակները հասանելի չեն: Փոխարենը օգտագործեք 'Հարցնել " "գաղտնաբառը':" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 +#: ../../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 "" -"'Նորմալ' և 'Գործածողը' եղանակները հասանելի չեն: Փոխվել է 'Հարցնել " -"գաղտնաբառով':" +"'Նորմալ' և 'Հաշիվը' եղանակները հասանելի չեն: Փոխվել է 'Հարցնել գաղտնաբառով':" -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../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 " @@ -1128,8 +1143,8 @@ #, c-format msgid "(%d object filtered)" msgid_plural "(%d objects filtered)" -msgstr[0] "(%d-ը ֆիլտրված է)" -msgstr[1] "(%d-ը ֆիլտրված են)" +msgstr[0] "(%d առարկա է զտվել)" +msgstr[1] "(%d առարկաներ են զտվել)" #: ../../locales/../src/interface/update_dialog.cpp:254 #, c-format @@ -1171,8 +1186,8 @@ 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/dialogs.xrc:3591 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1231,7 +1246,7 @@ msgid "64-bit system" msgstr "64 բիթային համակարգ" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "« &Հետ" @@ -1242,15 +1257,15 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:103 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." -msgstr "Այս անունով արդեն կա։ Նշեք այլ անուն։" +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:116 -#: ../../locales/../src/interface/state.cpp:740 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Այս թղթապանակը չի կարող տեղափոխվել ենթաթղթապնակ։" @@ -1267,16 +1282,16 @@ msgid "A file previously opened has been changed." msgstr "Բացված ֆայլը փոփոխվել է։" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "A file with that name is already being transferred." msgstr "Այս անունով ֆայլ արդեն փոխանցվում է։" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "" "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 " @@ -1293,7 +1308,7 @@ msgid "A new version of FileZilla is available:" msgstr "Հասանելի է FileZilla-ի նոր տարբերակը." -#: ../../locales/../src/interface/Mainfrm.cpp:658 +#: ../../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." @@ -1308,7 +1323,7 @@ "you need this." msgstr "Սովորաբար սպասարկիչը սա չի պահանջում։" -#: ../../locales/../src/interface/state.cpp:256 +#: ../../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?" @@ -1317,7 +1332,7 @@ "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել թղթապանակի փոփոխությունները։" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1342,11 +1357,11 @@ msgid "A&pply to all files and directories" msgstr "Կ&իրառել բոլոր ֆայլերին թղթապանակներին" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "Ջնջ&ել հաջողված բեռնումները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1358,21 +1373,21 @@ msgid "Above the file lists" msgstr "Ֆայլերի ցանկից վեր" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../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: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/sitemanager_dialog.cpp:1271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1272 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 msgid "Account" -msgstr "Գործածող" +msgstr "Հաշիվ" #: ../../locales/../src/interface/resources/xrc/menus.xrc:375 msgid "Action after queue &completion" -msgstr "Գործողություն՝ առաջադրանքը կատարելուց &հետո" +msgstr "Գործողություն՝ հերթականությունը կատարելուց &հետո" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" @@ -1390,7 +1405,7 @@ msgid "Active mode" msgstr "Ակտիվ եղանակ" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1398,7 +1413,7 @@ "FTP-ի ակտիվ եղանակի թեստը անհաջող էր։ FileZilla-ն չգիտի արտաքին ճիշտ IP " "հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1406,7 +1421,7 @@ "FTP-ի ակտիվ եղանակի թեստը անհաջող էր։ FileZilla-ն չգիտի արտաքին ճիշտ IP " "հասցեն։ Բացի դա փոփոխվել է ուղարկված հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1420,30 +1435,30 @@ msgid "Active mode IP" msgstr "IP հասցեն՝ ակտիվ եղանակի համար" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" -msgstr "&Ֆայլերն ավելացնել միայն հերթում" +msgstr "Ֆայլերն ավելացնել միայն &հերթականությանը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../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 "Ավելացնել ընտրված թղթապանակները հերթում" +msgstr "Ավելացնել ընտրված թղթապանակները հերթականությանը" #: ../../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 "Ավելացնել ընտրված թղթապանակները և ֆայլերը հերթում" +msgstr "Ավելացնել ընտրված թղթապանակները և ֆայլերը հերթականությանը" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1823 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1843 msgid "Add to queue" -msgstr "Ավելացնել առաջադրանք" +msgstr "Ավելացնել հերթականությանը" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Հասցեի տեսակը չի աջակցվում" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Լրացուցիչ" @@ -1460,7 +1475,7 @@ "նախատեսված են փորձարկման համար: FileZilla-ի nightly build-երը հնարավոր է " "նորմալ չաշխատեն և անգամ վնասեն ձեր համակարգը: Այնպես որ զգույշ եղեք:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Միշ&տ օգտագործել այս գործողությունը" @@ -1468,7 +1483,7 @@ msgid "Algorithm:" msgstr "Ալգորիթմը." -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Բոլոր ֆայլերը հաջողությամբ փոխանցվել են" @@ -1476,7 +1491,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Բոլոր պորտերը պետք է գտնվեն 1024-ի և 65535-ի միջև։" -#: ../../locales/../src/interface/QueueView.cpp:2960 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1491,15 +1506,15 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Թույլ տալ վերադառնալ այլ եղանակի՝ ձախողման դեպքում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Արդեն կապակցված է" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" -msgstr[0] "Այլընտրանքային անուններ" -msgstr[1] "Ֆ&իլտրի անունը." +msgstr[0] "Այլընտրանքային անուն." +msgstr[1] "Այլընտրանքային անուններ." #: ../../locales/../src/interface/resources/xrc/settings.xrc:660 msgid "" @@ -1523,57 +1538,57 @@ "website:" msgstr "Նաև կարող եք ներբեռնել FileZilla-ի նոր տարբերակը ծրագրի կայքից." -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, 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:1818 #, 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/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: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: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 "Անանուն" -#: ../../locales/../src/interface/state.cpp:914 +#: ../../locales/../src/interface/state.cpp:937 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:808 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 "Ֆիլտրերի որևէ փոփոխություն չի պահպանվի։" +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 "Ֆիլտրերի որևէ փոփոխություն չի պահպանվի։" +msgstr "Զտիչների որևէ փոփոխություն չի պահպանվի։" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:555 msgid "App&ly to directories only" @@ -1585,7 +1600,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" -msgstr "Կիրառել միայն &այս առաջադրանքին" +msgstr "Կիրառել միայն &այս հերթականությանը" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:548 msgid "Apply to &files only" @@ -1595,13 +1610,13 @@ msgid "Archive" msgstr "Արխիվ" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Փաստարկի պահոցը գերազանցվել է" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1328 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 @@ -1611,9 +1626,9 @@ 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:856 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Գաղտնաբառի հարցում" @@ -1625,7 +1640,7 @@ 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:3416 msgid "Asking questions in the FileZilla forums" msgstr "Հարցեր տալ FileZilla-ի Ֆորումում" @@ -1635,7 +1650,7 @@ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 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." @@ -1645,15 +1660,15 @@ msgid "Attribute" msgstr "Հատկանիշ" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." -msgstr "Ներկայացումը ձախողվեց։" +msgstr "Իսկորոշումը ձախողվեց։" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Հեղինակը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Ինքնա" @@ -1670,15 +1685,15 @@ msgid "B " msgstr "B <Նշան բայթերի համար։ Թարգմանել միայն առաջին տառը>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 msgid "B&ypass proxy" msgstr "Շ&րջանցել պրոքսին" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Ֆայլի վատբնութագրիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Օգտագործման հիմնական ցուցումներ" @@ -1686,16 +1701,16 @@ msgid "Behaviour" msgstr "Դրությունը" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "Խմբագրվում է" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Ուշադրություն. Սերտիֆիկատը մերժվել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2534 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Կրկնակի" @@ -1705,18 +1720,22 @@ #: ../../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_dialog.cpp:418 msgid "Bookmark" msgstr "Էջանիշ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Էջանիշ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2779 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Էջանիշներ" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Ընտրել..." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Թողարկման ամսաթիվը." @@ -1725,7 +1744,7 @@ msgid "Build information" msgstr "Տարբերակի մասին" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Գործնեության տեսակը." @@ -1736,18 +1755,19 @@ "please enter the port range below." msgstr "" "Ըստ ծրագրայինի օգտագործվում է հասանելի տեղային պորտ՝ ակտիվ եղանակում " -"փոխանցումների համար։ Եթե ցանկանում եք նշել մեկ ուրիշը, կատարեք դա ստորև։" +"փոխանցումների համար։ Եթե ցանկանում եք մուտքագրել մեկ ուրիշը, կատարեք դա " +"ստորև։" #: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" msgstr "Չ&եղարկել այս գործողությունը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" msgstr "Ջ&նջել բոլորը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "&Պատճենել հիշապահեստում" @@ -1764,21 +1784,21 @@ msgstr "CPU-ի հատկություններ." #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1201 +#: ../../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:716 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:718 #, c-format msgid "Can't write data to file: %s" msgstr "Հնարավոր չէ գրել տվյալներ %s ֆայլում" @@ -1794,15 +1814,16 @@ #: ../../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/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 "Չեղարկել" @@ -1814,20 +1835,20 @@ msgid "Cancels the current operation" msgstr "Չեղարկել ընթացիկ գործողությունը" -#: ../../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 "Մուտք չկա '%s'-ին։" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Հնարավոր չէ ավելացնել սպասարկիչը Կայքերի կառավարիչում" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Հնարավոր չէ կցել պահանջվող հասցեն" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:349 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1840,29 +1861,29 @@ "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:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../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 "Հնարավոր չէ խմբագրել ֆայլը, ճանապարհը հայտնի չէ։" +msgstr "Հնարավոր չէ խմբագրել ֆայլը, ուղին հայտնի չէ։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1873,52 +1894,52 @@ msgid "Cannot load Quickconnect bar from resource file" msgstr "Հնարավոր չէ բացել Արագ կապակցման վահանակը ռեսուրսների ֆայլից" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 -msgid "Cannot load keyfile" -msgstr "Հնարավոր չէ բացել բանալի-ֆայլը" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Հնարավոր չէ բեռնել բանալի ֆայլը" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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 "Հնարավոր չէ հիշել գաղտնաբառը" #: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Cannot rename entry" -msgstr "Հնարավոր չէ անվանափոխել" +msgstr "Հնարավոր չէ վերանվանել" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" -msgstr "Հնարավոր չէ անվանափոխել ֆայլը" +msgstr "Հնարավոր չէ վերանվանել ֆայլը" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Հնարավոր չեղավ ուղղել հոսթի անունը IPv4 հասցեների համար՝ SOCKS4 պրոքսիով:" -#: ../../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 "Հնարավոր չէ պահպանել ֆիլտրերը" +msgstr "Հնարավոր չէ պահպանել զտիչները" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 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:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Հնարավոր չէ ասոցացնել ֆայլը" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Հնարավոր չէ ցուցադրել երկխոսության պատուհանը" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Հնարավոր չէ դիտել/խմբագրել ընտրված ֆայլը" @@ -1963,7 +1984,7 @@ msgstr "Փոխել ֆայլի հատկանիշը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Փոխել ֆայլի լիազորությունները։" @@ -1972,11 +1993,11 @@ msgstr "" "Փոփոխությունը ուժի մեջ մտնելու համար պահանջվում է FileZilla-ի վերամեկնարկում։" -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Նշաների կոդավորման սխալ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Կոդավորումը" @@ -2000,19 +2021,19 @@ msgid "Check for updates failed" msgstr "Հնարավոր չեղավ ստուգել թարմացումները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "Ստուգել մուտքի տվյալները: Մուտքագրված գաղտնաբառի վերջում կա բացատ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 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:761 msgid "Checking for correct external IP address" msgstr "Ստուգվում է ճիշտ արտաքին IP հասցեն" @@ -2020,27 +2041,31 @@ 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:1440 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +msgid "Choose a key file" +msgstr "Ընտրել բանալի ֆայը" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 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:2132 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "Ընտրել թղթապանակ համակարգչում" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Որոշ տվյալներ ճիշտ չեն ջնջվել" @@ -2049,7 +2074,7 @@ msgstr "Նիշը." #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "Փակ&ել պատուհանը" @@ -2057,7 +2082,7 @@ msgid "Classic" msgstr "Դասական" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" msgstr "Ջնջել &հիշոցը" @@ -2078,25 +2103,25 @@ msgid "Clear quickconnect bar" msgstr "Մաքրել արագ կապակցումները" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Սեղմեք 'Ավարտել'՝ կազմաձևումը պահպանելու համար։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "MAC-ի սպասրկիչ ծրագիր." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "Սպասարկիչ ծրագրի շիֆրը." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" msgstr "Փակել &բոլոր այլ պատուհանները" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Փակել FileZilla-ն" @@ -2108,7 +2133,7 @@ msgid "Closes current tab" msgstr "Փակել այս պատուհանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Մեկ&նաբանություններ." @@ -2116,7 +2141,7 @@ msgid "Column properties" msgstr "Սյան հատկությունները" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Սյան կարգավորում" @@ -2124,13 +2149,13 @@ 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:153 -#: ../../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:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Հրամանը չի աջակցվում" @@ -2138,32 +2163,32 @@ 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 "Հրամանը." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Մեկնաբանություններ." -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Ընդհանուր անունը." -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 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:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 msgid "Compare &modification time" msgstr "Համեմատել &փոփոխման ժամանակը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Համեմատել ֆայլերի &չափը" @@ -2200,7 +2225,7 @@ msgstr "Զուգահեռ փոխանցումներ" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "Զգայուն է &գրանցատեղի նկատմամբ" @@ -2216,24 +2241,24 @@ msgid "Configure port range" msgstr "Դարպասների կազմաձևում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 +#: ../../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: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: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 "Պահանջվում է հաստատում" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Շնորհավորում ենք, Ձեր կազմաձևումը աշխատում է։" @@ -2241,6 +2266,11 @@ msgid "Connect bypassing proxy settings" msgstr "Կապակցել՝ շրջանցելով պրոքսին" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Պրոքսիի հարցման սխալ. %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Կապակցել այս պատուհանում" @@ -2253,29 +2283,29 @@ msgid "Connect to specified Site Manager site" msgstr "Կապակցել կայքին՝ Կայքերի կառավարիչից" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "Կապակցված է" -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Կապակցում" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, 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:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#, 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:959 +#: ../../locales/../src/engine/proxy.cpp:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Կապակցում է %s-ին..." @@ -2284,129 +2314,134 @@ msgid "Connection" msgstr "Կապակցում" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Կապակցումը անջատվել է" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../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:240 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Հնարավոր չէ կապակցել \"%s\"-ին, փորձվում է այլ հասցե։" -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../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:1065 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Գերազանցվել է սպասելու ժամանակը" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Կապակցումը անջատվել է" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Կապը հաստատված է, որոշվում է TLS-ն..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../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:333 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Կապը հաստատված է, սպասվում է հրավեր..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Կապը հաստատված է, սպասվում է հրավեր..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Կապը ընդհատվել է" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Կապը չի համապատասխանում կանոններին" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Կապը մերժված է" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Կապակցումը անջատվել է սպասարկիչի կողմից" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" 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] "Կապակցման ժամանակի լրացում %d վայրկյան պասիվությունից հետո" msgstr[1] "Կապակցման ժամանակի լրացում %d վայրկյան պասիվությունից հետո" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 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:249 msgid "Connection with proxy established, performing handshake..." -msgstr "Միջնորդային կապակցումը կատարված է, հաստատվում է..." +msgstr "Պրոքսի կապակցումը կատարված է, հաստատվում է ձեռքսեղմում..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Կապակցումը սպասարկիչին անջատվել է ժամանակավրեպ։" -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Հնարավոր չեղավ կապակցել թեստային սպասարկիչի հետ։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:265 -msgid "Convert keyfile" -msgstr "Փոխարկել բանալի-ֆայլը" +#: ../../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:1739 +#: ../../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:1719 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, 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:516 msgid "Copy the URLs of the selected items to clipboard." msgstr "Պատճենել ընտրված գրառման URL-ները գզրոց։" -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Հնարավոր չէ կապակցել. %s" @@ -2416,30 +2451,30 @@ msgid "Could not add connection to Site Manager" msgstr "Հնարավոր չէ ավելացնել Կայքերի կառավարիչում" -#: ../../locales/../src/interface/state.cpp:755 +#: ../../locales/../src/interface/state.cpp:750 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:1084 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Հնարավոր չէ կապակցել սպասարկիչին. %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 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: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 "Հնարավոր չէ պատճենել հասցեները" @@ -2447,17 +2482,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 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Հնարավոր չէ ստեղծել մուտքային ֆայլ՝ %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" @@ -2467,11 +2502,11 @@ "Հնարավոր չէ որոշել Drag&Drop-ի գործողությունը։\n" "Կամ կան տեղակայման սխալներ կամ Դուք չեք վերցրել ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4091 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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 " @@ -2480,44 +2515,49 @@ msgstr "" "Հնարավոր չէ գտնել FileZilla-ի ռեսուրսների ֆայլը, ծրագիրը կփակվի։\n" "Տեղավորեք FileZilla-ի ծրագրային գրադարանը՝ օգտագործելով հրաման. '--datadir " -"<ճանապարհը>'։" +"<ուղին>'։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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:900 +#: ../../locales/../src/interface/state.cpp:923 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/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:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../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 +#, fuzzy, 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" @@ -2534,15 +2574,15 @@ "Հնարավոր չէ բացել \"%s\", ստուգեք ֆայլի հասանելիությունը։\n" "Կայքերի կառավարիչում կատարված փոփոխությունները չեն պահպանվի։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:220 -msgid "Could not load keyfile" -msgstr "Հնարավոր չէ բացել բանալի-ֆայլը" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Հնարավոր չեղավ բեռնել բանալի ֆայլը" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:290 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Հնարավոր չէ բացել գաղտնի բանալին" -#: ../../locales/../src/interface/state.cpp:922 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2552,7 +2592,7 @@ "Չկա մուտք համակարգչային թղթապանակին, որը համապատասխանում է հեռակա '%s'-ին։\n" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռակա թղթապանակի փոփոխումը։" -#: ../../locales/../src/interface/state.cpp:359 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2562,7 +2602,7 @@ "Չկա մուտք համակարգչային թղթապանակին, որը համապատասխանում է հեռակա '%s'-ին։\n" "Համաժամանակեցված դիտումը անջատվել է։" -#: ../../locales/../src/interface/state.cpp:265 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2573,36 +2613,46 @@ "Համաժամանակեցված դիտումը անջատվել է։" #: ../../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 ֆայլը" #: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." -msgstr "Հնարավոր չէ որոշել հեռակա ճանապարհը։" +msgstr "Հնարավոր չէ որոշել հեռակա ուղին։" #: ../../locales/../src/interface/quickconnectbar.cpp:82 msgid "Could not parse server address:" msgstr "Հնարավոր չեղավ որոշել սպասարկիչի հասցեները." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Հնարավոր չէ ստանալ տվյալներ բնիկից. %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Հնարավոր չէ ստանալ տվյալներ բնիկից. %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:2591 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +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 ֆայլում" @@ -2611,25 +2661,25 @@ 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:223 msgid "Could not send command to fzputtygen." msgstr "Հնարավոր չէ հրաման ուղարկել fzputtygen-ին։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2619 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Հնարավոր չէ օգտագործել I/O գործողությունը!" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" -msgstr "Հնարավոր չէ հաստատել միջնորդավորված կապակցումը. %s" +msgstr "Հնարավոր չէ հաստատել պրոքսի կապակցում. %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Հնարավոր չէ սկսել փոխանցումը" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2648,49 +2698,49 @@ msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Հնարավոր չէ գրել \"%s\", ընդհանուր էջանիշը չի պահպանվել. %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, 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: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" +msgstr "Հնարավոր չէ գրել \"%s\", հնարավոր չէ արտահանել ընտրված ֆայլերը. %s" #: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "Հնարավոր չէ գրել \"%s\"." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:313 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" -msgstr "Հնարավոր չէ գրանցել գաղտնի բանալին. %s" +msgid "Could not write key file: %s" +msgstr "Հնարավոր չեղավ գրել բանալու ֆայլը. %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../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:983 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Հնարավոր չէ գրանցել տվյալները. %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "Երկիրը." @@ -2698,17 +2748,25 @@ msgid "Crea&te new file" msgstr "Ստեղ&ծել նոր ֆայլ" +#: ../../locales/../src/interface/state.cpp:959 +msgid "Create &missing local directory and enter it" +msgstr "Ստեղծել &թղթապանակ և մուտք գործել" + +#: ../../locales/../src/interface/state.cpp:886 +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:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../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 "Ստեղծել թղթապանակ" #: ../../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:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Ստեղծել նոր ենթաթղթապանակ տվյալ թղթապանակում" @@ -2718,50 +2776,50 @@ #: ../../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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Create director&y and enter it" msgstr "Ստեղծել թղթապանա&կ և մուտք գործել" -#: ../../locales/../src/interface/LocalListView.cpp:897 +#: ../../locales/../src/interface/LocalListView.cpp:902 #: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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:390 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Ստեղծվում է թղթապանակ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1917 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../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 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" 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:350 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2782,21 +2840,25 @@ msgid "Current transfer type is set to binary." msgstr "Ընտրված է binary եղանակը։" +#: ../../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 "Պատահա&կան" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 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:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Ընտրված սպասարկիչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2498 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Ֆ&այլերի տեսակը" @@ -2804,16 +2866,20 @@ msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "SI նշաններ (օր.՝, 1 ԿԲ = 1000 բայթ)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "Ըս&տ ծրագրայինի" #: ../../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:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 msgid "D&elete" msgstr "Ջ&նջել" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Թ&ղթապանակների համեմատություն" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Ա&րգելել բոլորը" @@ -2827,24 +2893,24 @@ msgstr "Գ&ործողություն մկնիկի կրկնակի սեղմամբ." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "Կ&րկնօրինակել" #: ../../locales/../src/engine/server.cpp:34 msgid "DOS-like with virtual paths" -msgstr "DOS-ի տեսքով՝վիրտուալ ճանապարհով" +msgstr "DOS-ի տեսքով՝ վիրտուալ ուղի" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Ֆայլերի վտանգավոր տեսակներ" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Տվյալներ" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Տվյալների բնիկը շուտ է փակվել։" @@ -2872,7 +2938,7 @@ msgid "Debugging settings" msgstr "Վրիպազերծման կարգավորումներ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Համակարգչային հիմնական &թղթապանակը." @@ -2890,16 +2956,16 @@ msgid "Default file exists action" msgstr "Եթե ֆայլը կար ծրագրային գործողությունը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" -msgstr "Հ&եռադիր հիմնական թղթապանակը." +msgstr "Հ&եռակա հիմնական թղթապանակ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../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 "" -"Հնարավոր չէ որոշել հեռակա ծրագրային ճանապարհը։ Համոզվեք, որ այն ճիշտ է նշված։" +"Հնարավոր չէ որոշել հեռակա ծրագրային ուղին։ Համոզվեք, որ այն ճիշտ է նշված։" #: ../../locales/../src/interface/settings/optionspage_language.cpp:71 msgid "Default system language" @@ -2934,12 +3000,12 @@ msgstr[0] "Սպասում է կապակցման %d վայրկյան՝ անհաջող կապակցումից հետո..." msgstr[1] "Սպասում է միացման %d վայրկյանից անհաջող միացումից հետո..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" msgstr "Ջնջել Կայքերի կառավարիչից" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" msgstr "Ջնջել ընտրված թղթապանակը" @@ -2958,15 +3024,7 @@ 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:3211 msgid "Deleting symbolic link" msgstr "Նշանային հղման ջնջում" @@ -2984,7 +3042,7 @@ msgstr "Նոր բանալու մանրամասները." #: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:742 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 msgid "Detected newer version of FileZilla" msgstr "Հասանելի է FileZilla-ի նոր տարբերակ" @@ -2992,7 +3050,7 @@ msgid "Dire&ctories" msgstr "Թղթա&պանակներ" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Դեպի՝" @@ -3000,13 +3058,13 @@ msgid "Directory" msgstr "Թղթապանակ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2766 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../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:323 +#: ../../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/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Թղթապանակների համեմատում" @@ -3016,26 +3074,26 @@ #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71 msgid "Directory containing the logfile does not exist or filename is invalid." -msgstr "log ֆայլերով թղթապանակ գոյություն չունի կամ ճանապարհը սխալ է։" +msgstr "log ֆայլերով թղթապանակ գոյություն չունի կամ ուղին սխալ է։" -#: ../../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 "Հնարավոր չեղավ կառուցել թղթապանակների ցանկը" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" -msgstr "Թղթապանակների ցանկի կառուցման ֆիլտրեր" +msgstr "Թղթապանակների ցանկի կառուցման զտիչներ" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "\"%s\"-ի թղթապանակների կազմը ստացվեց" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Թղթապանակների կազմը ստացվեց" @@ -3043,13 +3101,13 @@ msgid "Disa&ble all" msgstr "Արգել&ել բոլորը" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռակա թղթապանակի փոփոխումը։" -#: ../../locales/../src/interface/Mainfrm.cpp:660 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3059,23 +3117,23 @@ msgid "Disconnect from server" 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: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 "Անջատում սպասարկիչից" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../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:380 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Անջատվում է նախորդ սպասարկիչից" @@ -3101,29 +3159,31 @@ msgid "Do the same with &all selected files already being edited" msgstr "Նույն կատարել &բոլոր ընտրված ֆայլերի համար, որոնք խմբագրվում են" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 -#: ../../locales/../src/interface/Mainfrm.cpp:1170 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Փակե՞լ FileZilla-ն։" #: ../../locales/../src/interface/clearprivatedata.cpp:34 msgid "" "Do you really want to delete all Site Manager entries and the transfer queue?" -msgstr "Ջնջե՞լ բոլոր կարգավորումները Կայքերի կառավարիչից։" +msgstr "" +"Ջնջե՞լ բոլոր կարգավորումները և փոխանցման հերթականությունը Կայքերի " +"կառավարիչից։" #: ../../locales/../src/interface/clearprivatedata.cpp:46 msgid "Do you really want to delete all Site Manager entries?" msgstr "Ջնջե՞լ բոլոր կարգավորումները Կայքերի կառավարիչից։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Ջնջե՞լ ընտրված գրառումը։" #: ../../locales/../src/interface/clearprivatedata.cpp:40 msgid "Do you really want to delete the transfer queue?" -msgstr "Ջնջե՞լ ընտրված առաջադրանքը։" +msgstr "Ջնջե՞լ ընտրված փոխանցման հերթականությունը։" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Փոխանցե՞լ '%s'-ը սպասարկիչի վրա։" @@ -3132,7 +3192,7 @@ msgid "Do you want to reopen this file?" msgstr "Կրկի՞ն բացել այս ֆայլը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Թղթաբանություն" @@ -3150,31 +3210,31 @@ msgid "Double-click action" msgstr "Մկնիկի կրկնակի սեղմում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Բեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3546 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" -msgstr "Բեռնման &սահմանափակում." +msgstr "Ներբեռնելու &սահմանափակում." #: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" -msgstr "Բեռնման սահմանափակում. %s/s" +msgstr "Ներբեռնելու սահմանափակում. %s/s" #: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" -msgstr "Բեռնման սահմանափակումներ. չկան" +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:3110 +#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:529 msgid "Download search results" msgstr "Բեռնել փնտրման արդյունքը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Բեռնել ընտրված թղթապանակը" @@ -3182,7 +3242,7 @@ msgid "Download selected files and directories" msgstr "Բեռնել ընտրված ֆայլերը և թղթապանակները" -#: ../../locales/../src/interface/Mainfrm.cpp:976 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3191,42 +3251,34 @@ "Բեռնելու արագ-ը. %s/վ\n" "Վերբեռնելու արագ-ը. %s/վ" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "Բեռնվում է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../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:107 -#: ../../locales/../src/interface/QueueView.cpp:87 +#: ../../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:87 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." msgstr "Drag&drop հնարավորությունը FileZilla-ի օրինակների միջև անհասանելի է։" -#: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../locales/../src/interface/QueueView.cpp:100 +#: ../../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:93 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Drag&drop-ը տարբեր սպասարկիչների միջև անհասանելի է։" @@ -3251,33 +3303,39 @@ msgid "E&xit" msgstr "Փակ&ել" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../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 "Ա&րտահանել..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "E-Mail:" msgstr "E-Mail-ը." #: ../../locales/../src/interface/filter_conditions_dialog.cpp:667 msgid "Each filter needs at least one condition." -msgstr "Յուրաքանչյուր ֆիլտրը պետք է ունենա գոնե մեկ պայման։" +msgstr "Յուրաքանչյուր զտիչ պետք է ունենա գոնե մեկ պայման։" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" -msgstr "Խմբագրել ֆիլտրերը" +msgstr "Խմբագրել տիչները" #: ../../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/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" 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 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Որոնման արդյունքների խմբագրում" @@ -3285,7 +3343,7 @@ msgid "Email:" msgstr "Email-ը." -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Դատարկ հրաման" @@ -3293,7 +3351,7 @@ msgid "Empty command." msgstr "Դատարկ հրաման։" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Թղթապանակներ չկան" @@ -3301,6 +3359,12 @@ 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 "Ֆայլի ընդլայնումը հայտնի չէ։" @@ -3308,7 +3372,7 @@ #: ../../locales/../src/interface/filteredit.cpp:208 #: ../../locales/../src/interface/filteredit.cpp:250 msgid "Empty filter names are not allowed." -msgstr "Նշեք ֆիլտրի անունը։" +msgstr "Նշեք զտիչի անունը։" #: ../../locales/../src/interface/filteredit.cpp:208 #: ../../locales/../src/interface/filteredit.cpp:250 @@ -3325,13 +3389,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" -msgstr "Թույլատրել &սխալ նշանների ֆիլտրացիան" +msgstr "Թույլատրել սխալ նշանների &զտումը" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:107 msgid "Encrypted" msgstr "Կոդավորված" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Կոդավորումը" @@ -3339,7 +3403,7 @@ msgid "Encryption details" msgstr "Կոդավորման տվյալները" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Ավարտել համեմատումը և փոփոխել դասավորման կարգը։" @@ -3347,17 +3411,17 @@ msgid "Enter &custom command..." msgstr "Գրել &հրաման..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3587 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Մուտքագրեք 0՝ սահմանափակումները անջատելու համար։" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" -msgstr "Նշեք հրաման" +msgstr "Մուտքագրեք հրաման" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" -msgstr "Նշեք հրաման" +msgstr "Մուտքագրեք հրաման" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" @@ -3367,19 +3431,19 @@ #: ../../locales/../src/interface/filteredit.cpp:196 #: ../../locales/../src/interface/filteredit.cpp:243 msgid "Enter filter name" -msgstr "Նշեք ֆիլտրի անունը" +msgstr "Մուտքագրեք զտիչի անունը" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" -msgstr "Նշեք ֆիլտրերի անունը" +msgstr "Մուտքագրեք զտիչների անունը" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" -msgstr "Ֆիլտրերի նոր անունը" +msgstr "Զտիչների նոր անուն" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:253 msgid "Enter password" -msgstr "Նշեք գաղտնաբառը" +msgstr "Մուտքագրեք գաղտնաբառը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:251 #: ../../locales/../src/interface/resources/xrc/menus.xrc:297 @@ -3401,7 +3465,7 @@ "- ftps:// for FTP over TLS (implicit)\n" "- ftpes:// for FTP over TLS (explicit)" msgstr "" -"Նշեք սպասարկիչի հասցեն:\n" +"Մուտքագրեք սպասարկիչի հասցեն:\n" "Որոշելու համար սպասարկիչի արձանագրությունը՝ հոսթը ավելացրեք արձանագրության " "որոշիչով: Եթե արձանագրությունը նշված չէ՝ կօգտագործվի ծրագրայինը (ftp://):\n" "Այստեղ կարող եք նաև նշել ամբողջական URL-ներ՝ protocol://user:pass@host:port, " @@ -3413,89 +3477,89 @@ "ftps:// FTP՝ TLS-ի միջոցով (ենթադրելի) և\n" "ftpes:// FTP՝ TLS-ի միջոցով (բացահայտ)." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:270 +#: ../../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" -"Ձևափոխված ֆայլը պաշտպանված չի լինի գաղտնաբառով։" +"Մուտքագրեք գաղտնաբառ '%s' ֆայլի համար։\n" +"Փոխարկված ֆայլը պաշտպանված կլինի նույն գաղտնաբառով։" #: ../../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 "" -"Նշեք սպասարկիչի պորտի համարը։\n" +"Մուտքագրեք սպասարկիչի պորտի համարը։\n" "Ըստ ծրագրայինի՝ FTP-ն դա 21 է, SFTP-ի համար 22 է։" -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" -msgstr "Նշեք օգտատերի անունը և գաղտնաբառը" +msgstr "Մուտքագրեք օգտատերի անունը և գաղտնաբառը" #: ../../locales/../src/interface/export.cpp:26 msgid "Error exporting settings" -msgstr "Սխալ՝ կարգավորումները արտածելիս" +msgstr "Սխալ՝ կարգավորումները արտահանելիս" #: ../../locales/../src/interface/import.cpp:28 #: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Սխալ՝ ներմուծման" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" -msgstr "Հերթի բացման սխալ" +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/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:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 +#: ../../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: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/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 "Սխալ՝ xml ֆայլը բացելիս" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" -msgstr "Հերթի պահպանման սխալ" +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: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: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/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 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 "Սխալ." @@ -3521,7 +3585,7 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" -msgstr "Արտածել &առաջադրանքը" +msgstr "Արտահանել &հերթականությունը" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" @@ -3533,13 +3597,13 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" -msgstr "Ֆ&իլտրի անունը." +msgstr "Զ&տիչի անունը." #: ../../locales/../src/interface/settings/settingsdialog.cpp:93 msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:508 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - Ֆայլերի փոխանցման արձանագրություն" @@ -3552,7 +3616,7 @@ msgstr "FTP - Ֆայլերի փոխանցման արձանագրությունը վստահելի չէ" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "FTP-ի հենքը որոշված չէ, հնարավոր չէ կապակցել" @@ -3575,7 +3639,7 @@ "connections can be established in two ways." msgstr "" "FTP-ն փոխանցման համար օգտագործում է երկրորդական կապուղիներ։ Այս կապումները " -"կարող են իրականացվել երկու ճանապարհով։" +"կարող են իրականացվել երկու ուղիով։" #: ../../locales/../src/engine/server.cpp:20 msgid "FTPES - FTP over explicit TLS" @@ -3585,24 +3649,24 @@ 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/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:1920 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Հնարավոր չէ պատճենել կամ տեղափոխել կայքերը" @@ -3610,28 +3674,28 @@ msgid "Failed to create backup copy of xml file" msgstr "Հնարավոր չէ ստեղծել xml ֆայլի պահեստային օրինակը" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Հնարավոր չէ ստեղծել պորտի լսիչ, ընդհատում է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4070 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "Հնարավոր չէ ստեղծել բնիկի լսիչ՝ փոխանցման ակտիվ եղանակի համար" -#: ../../locales/../src/interface/LocalTreeView.cpp:623 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" -msgstr "'My Documents'-ի ճանապարհը հասանելի չէ" +msgstr "'My Documents'-ի ուղին հասանելի չէ" -#: ../../locales/../src/interface/LocalTreeView.cpp:611 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" -msgstr "'Desktop '-ի ճանապարհը հասանելի չէ" +msgstr "'Desktop '-ի ուղին հասանելի չէ" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "Հնարավոր չեղավ ստանալ peer հասցեն։ Կապը անջատվեց։" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Հնարավոր չեղավ ստանալ peer հասցեն՝ տվյալների փոխանցման համար։ Կապը անջատվեց։" @@ -3640,17 +3704,22 @@ 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:301 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Հնարավոր չէ որոշել TLS-ի մղիչը!" +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Հնարավոր չէ որոշել FTP-ի մղիչը!" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Հնարավոր չէ բացել վահանակները։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:289 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Հնարավոր չէ բացել գաղտնի բանալին. %s" @@ -3666,77 +3735,77 @@ msgstr "Հնարավոր չէ բացել \"%s\" կարդալու համար։" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../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 "Հնարավոր չէ որոշել վերադարձված ճանապարհը։" +msgstr "Հնարավոր չէ որոշել վերադարձված ուղին։" -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 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:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, գործողությունը մերժվել է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, օգտագործվում է տեղային հասցե" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3802 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։ Մերժվում է" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն։" -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 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 լեզվին, օգտագործվում է ծրագրային լեզուն։" @@ -3745,11 +3814,11 @@ 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:531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Հնարավոր չէ գրել %s ֆայլում" @@ -3766,7 +3835,7 @@ msgid "Fall back to active mode" msgstr "Վերադարձ ակտիվ եղանակաին" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2286 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Ֆայ&լ." @@ -3782,7 +3851,7 @@ msgid "File Types" msgstr "Ֆայլերի տեսակները" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Ֆայլի բնութագրիչը բնիկ չէ" @@ -3794,7 +3863,7 @@ msgid "File editing" msgstr "Խմբագրել ֆայլը" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Ֆայլը գոյություն ունի" @@ -3810,9 +3879,9 @@ msgid "File lists" msgstr "Ֆայլերի ցանկը" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../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 "Ֆայլը չի գտնվել" @@ -3821,52 +3890,52 @@ 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:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Ֆայլը փոխանցվում է։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "Ֆայլը փոխանցվելու է ASCII տիպի տվյալներով։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2522 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 msgid "File would transfer with binary data type." msgstr "Ֆայլը փոխանցվելու է binary տիպի տվյալներով։" -#: ../../locales/../src/interface/FileZilla.cpp:407 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "FileZilla-ի սխալ" @@ -3878,11 +3947,11 @@ "FileZilla-ն կարող է փորձարկել կազմաձևման ձևը՝ համոզվելու համար, որ դրանք " "ճիշտ են։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "FileZilla-ն արդեն կապակցված է սպասարկիչին։" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Վերամեկնարկեք FileZilla-ն՝ լեզուն փոխելու համար։" @@ -3894,30 +3963,30 @@ msgid "Filelist status &bars" msgstr "Դրության &տողը" -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../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:38 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Ֆայլի անունը" #: ../../locales/../src/interface/resources/xrc/menus.xrc:66 msgid "Filename &filters..." -msgstr "Ֆիլտրեր՝ &ֆայլի անունով..." +msgstr "Զտիչներ՝ &ֆայլի անունով..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2970 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2159 +#: ../../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 "Հնարավոր չէ նշել %s թղթապանակի %s ֆայլի անունը" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Ֆայլի անունը սխալ է" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Ֆայլի անունը չի փոխվել" @@ -3941,7 +4010,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" @@ -3951,7 +4020,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" @@ -3964,11 +4033,11 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" -msgstr "Կիրառել ֆիլտր՝" +msgstr "Կիրառել զտիչ՝" #: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" -msgstr "Ֆայլի անունում ֆիլտրի սխալ նշաններ" +msgstr "Ֆայլի անունում զտիչի սխալ նշաններ" #: ../../locales/../src/interface/filteredit.cpp:149 #: ../../locales/../src/interface/filteredit.cpp:217 @@ -3989,26 +4058,26 @@ 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 "Այս ֆիլտրը արդեն գոյություն ունի" +msgstr "Այս զտիչը արդեն գոյություն ունի" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:68 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:3068 msgid "Find &files" msgstr "Գտնել &ֆայլեր" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Գտնել թ&ղթապանակներ" @@ -4025,7 +4094,7 @@ msgid "Fingerprint:" msgstr "Հաշվեգումարը." -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Արգելապատնեշ ծրագրի կազմաձևման ծրագիր" @@ -4050,7 +4119,7 @@ "Այս աշխատաշրջանում օգտագործվելու են ծրագրային կարգավորումները։ " "Կարգավորումների փոփոխությունները չեն պահպանվի։" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:481 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "UTF-8՝ &ստիպողաբար" @@ -4058,7 +4127,7 @@ msgid "Force showing &hidden files" msgstr "Ցուցադրել &թաքնված ֆայլերը" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Ցուցադրել թաքնված ֆայլերը" @@ -4071,12 +4140,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 "Գտնվել է նոր %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Մանրամասն թղթաբանություն" @@ -4084,48 +4153,48 @@ msgid "General" msgstr "Ընդհանուր" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "SOCKS սպասարկիչի ձախողում" #: ../../locales/../src/interface/resources/xrc/settings.xrc:706 #: ../../locales/../src/interface/settings/settingsdialog.cpp:98 msgid "Generic proxy" -msgstr "Հիմնական պրոքսին" +msgstr "Ընդհանուր պրոքսին" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:218 msgid "Get external IP address from the following URL:" msgstr "Ստանալ արտաքին IP հասցեն հետևյալ URL-ից։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3387 +#: ../../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 "Այս անունով ֆիլտրեր կան։ Փոխարինե՞լ։" +msgstr "Այս անունով զտիչներ կան։ Փոխարինե՞լ։" #: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Ընդհանուր էջանիշներ" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS սխալ %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" 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 "GnuTLS սխալ %d՝ %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS սխալ %d: %s" @@ -4146,7 +4215,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP TLS-ի միջոցով" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Hash:" @@ -4155,17 +4224,17 @@ msgstr "Թաքնված" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../locales/../src/interface/queue.cpp:911 +#: ../../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: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-ի միջև։" @@ -4173,17 +4242,17 @@ 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 msgid "Homepage:" msgstr "Վեբ կայքը." -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Հոսթը հանգչել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" msgstr "Հոսթի բանալու հանրագումարը." @@ -4195,7 +4264,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։" -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Հոսթը հասանելի չէ" @@ -4206,7 +4275,7 @@ msgid "Host:" msgstr "Հոսթ." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:357 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "Ժամ," @@ -4214,7 +4283,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (Օր.՝ 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 հասցեները չեն աջակցում SOCKS4 պրոքսի" @@ -4255,7 +4324,7 @@ "administrator." msgstr "Եթե բանալու փոփոխումը անսպասելի էր, դիմեք սպասարկիչի ադմինին։" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4263,7 +4332,7 @@ "Եթե խնդիրը չի լուծվել, դա նշանակում է, որ router-ը և/կամ firewall-ը " "շարունակում են արգելակել FileZilla-ն։" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4280,7 +4349,7 @@ "Երբ հաղորդագրությունների ֆայլի չափը հասնի լիմիտին, անվան վերջում կավելացվի " "\".1\" (հնարավոր է ջնջվի հինը), որից հետո կստեղծվի նորը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +#: ../../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." @@ -4288,14 +4357,14 @@ "Եթե հղումը ցույց է տալիս թղթապանակի վրա, ապա FileZilla-ն կարող է ջնջել այս " "հղումը կամ նրա հետ կապված թղթապանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "" "Եթե խնդիրը դեռ առկա է, ապա դիմեք router կամ firewall ծրագրի հեղինակներին։" -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "Եթե խնդիրը դեռ առկա է, ապա դիմեք router ծրագրի հեղինակներին։" @@ -4329,7 +4398,7 @@ "Սեղմելով 'Թեստ', FileZilla-ն կմիանա probe.filezilla-project.org-ին և " "կանցկացնի մի քանի պարզ թեստեր։" -#: ../../locales/../src/interface/Mainfrm.cpp:1169 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Եթե փակեք FileZilla-ն, փոփոխությունները չեն պահպանվի։" @@ -4338,7 +4407,7 @@ "If you enter the wrong filetypes, those files may get corrupted when " "transferred." msgstr "" -"Եթե նշեք ֆայլերի սխալ տեսակներ, ապա ֆայլերը կարող են վնասվել փոխանցման " +"Եթե մուտքագրեք ֆայլերի սխալ տեսակներ, ապա ֆայլերը կարող են վնասվել փոխանցման " "ժամանակ։" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:365 @@ -4353,7 +4422,7 @@ "Եթե կան խնդիրներ թղթապանակների ցանկի ստացման կամ ֆայլերի փոխանցման ժամանակ, " "փոխեք փոխանցման եղանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4385,7 +4454,7 @@ "Եթե օգտագործում եք router, համոզվեք, որ բոլոր նշված պորտերը հասանելի են այն " "համակարգչի համար, որում աշխատում է FileZill-ն։" -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4442,13 +4511,13 @@ "Պասիվ եղանակում, որը խորհուրդ է տրվում, 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" msgstr "Սերտիֆիկատի սխալ" -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Սխալ գաղտնաբառ" @@ -4460,17 +4529,21 @@ "Հնարավոր չեղավ ստանալ տեղեկություն FileZilla-ի նոր տարբերակի մասին: Փորձեք " "ավելի ուշ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Որոշվում է TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Ոչ անվտանգ ալգորիթմ" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 msgid "Insecure server, it does not support FTP over TLS." msgstr "Սպասարկիչը անվտանգ չէ, այն չի աջակցում FTP-ն 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:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Ինտերակտիվ" @@ -4478,29 +4551,29 @@ msgid "Interface" msgstr "Տեսքը" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Կանգնեցված է ազդանշանի կողմից" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Կանգնեցված է օգտատերի կողմից" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Չափը սխալ է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "HTTP-ի սխալ պատասխան" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" 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." @@ -4508,18 +4581,19 @@ "Գրանշանների սխալ հաջորդականություն է ստացել: UTF-8-ը անջատում է։ Ընտրեք " "UTF-8-ը Կայքերի կառավարչում ՝ այն ստիպողաբար միացնելու համար։" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../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:363 +#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:380 +#: ../../locales/../src/interface/netconfwizard.cpp:397 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 "Սխալ ամսաթիվ" @@ -4532,7 +4606,7 @@ msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Սխալ հոսթ, նշանից հետո պետք է լինի կետ և պորտը։" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Սխալ տվյալներ" @@ -4557,38 +4631,38 @@ "ftps:// FTP՝ TLS-ի միջոցով (ենթադրելի) և\n" "ftpes:// FTP՝ TLS-ի միջոցով (բացահայտ)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "Պրոսքի հոսթ, նշանից հետո պետք է լինի կետ և պորտը։" -#: ../../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:597 +#: ../../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 "Կայքի սխալ ճանապարհ" +msgstr "Կայքի սխալ ուղի" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" @@ -4598,23 +4672,23 @@ msgid "Invalid username given." msgstr "Օգտատերի անունը սխալ է։" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Սխալ արժեք ai_flags-ի համար" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Սխալ արժեք" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "Իրավաբանական երկիրը." -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Իրավաբանական հասցեն." -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Նահանգը կամ շրջանը." @@ -4622,7 +4696,7 @@ msgid "Keep directories on top" msgstr "Սկզբից ցուցադրել թղթապանակները" -#: ../../locales/../src/interface/Mainfrm.cpp:659 +#: ../../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 " @@ -4637,6 +4711,13 @@ 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 +msgid "Key file" +msgstr "Բանալու ֆայլ" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "Փ&ոքրագույն" @@ -4646,11 +4727,11 @@ msgid "Language" msgstr "Լեզուն" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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" @@ -4680,7 +4761,7 @@ msgid "Limit:" msgstr "Սահմանափակում." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Շատ է երկար" @@ -4688,13 +4769,14 @@ msgid "Linked against" msgstr "Բացի դա՝" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "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 "Ցանկը." @@ -4702,50 +4784,50 @@ msgid "Lo&west available port:" msgstr "Փոք&րագույն պորտը." -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Համակարգչում" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Օգտագործում է լոկալ հասցե" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Լոկալ վերջուղին փակվել է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2230 +#: ../../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 "Ֆայլի անունը սխալ է։" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" -msgstr "Ֆիլտրեր." +msgstr "Տեղային զտիչներ." #: ../../locales/../src/interface/viewheader.cpp:334 msgid "Local site:" -msgstr "Ճանապարհը." +msgstr "Տեղային կայք." -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Համակարգչային." @@ -4758,7 +4840,7 @@ msgid "Logging" msgstr "Մուտքը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4766,7 +4848,7 @@ "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է " "չաջակցի UTF-8։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4774,7 +4856,7 @@ "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է " "չաջակցի UTF-8։ Փորձվում է օգտագործել համակարգային կոդավորումը։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "Մուտքի հաջորդականությունը հաջող է կատարվել, բայց հնարավոր չեղավ մտնել։" @@ -4791,17 +4873,17 @@ "Մուտքի տեսակը կարող է օգտագործվել FTP հասցեի հետ։ Հատկանիշները պետք է լինեն " "'%s' կամ '%s'" -#: ../../locales/../src/interface/queue.cpp:867 -#: ../../locales/../src/interface/queue.cpp:954 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../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: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։" @@ -4813,44 +4895,44 @@ msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "Համոզվեք, որ ֆայլը հասանելի է և ճիշտ 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/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:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Վնասվել է գլխագիրը. %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 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/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 "Ձեռադիր փոխանցում" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Գտնվել է բոլորը հետևյալից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3011 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Գտնվել է ցանկացածը հետևյալից" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3012 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Ոչինչ չի գտնվել հետևյալից" @@ -4858,12 +4940,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Միաժամանակյա առավ. &փոխանցումներ." -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Հնարավոր չէ ստուգել հիշողությունը" -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1804 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Հաղորդագրությունների ֆայլը" @@ -4871,7 +4953,7 @@ msgid "Message log position" msgstr "Հաղորդագրությունների ֆայլի դիրքը" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Հաղորդագրությունները մեծ է" @@ -4879,15 +4961,15 @@ msgid "MiB" msgstr "ՄԲ" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "Րոպե" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Շարժել ներքև" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Շարժել վերև" @@ -4899,9 +4981,9 @@ msgid "My Documents" msgstr "My Documents" -#: ../../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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Իմ կայքերը" @@ -4910,17 +4992,17 @@ msgid "N/a" msgstr "Չկան տվյալներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Անունը" #: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" 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 "Այս անունով էջանիշ արդեն կա։" @@ -4934,28 +5016,28 @@ #: ../../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:391 msgid "Need to enter valid remote path" -msgstr "Պետք է նշել գործող հեռակա ճանապարհը" +msgstr "Պետք է նշել գործող հեռակա ուղի" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1000 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Նշեք նշանների կոդավորումը" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Որևէ անուն չի նշվել կամ այն հայտնի չէ" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1066 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:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Ցանցը հասանելի չէ" @@ -4971,12 +5053,12 @@ msgid "New &tab" msgstr "Նոր &պատուհան" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Նոր &Էջանիշ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../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 @@ -4990,14 +5072,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:2070 +#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 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/RemoteListView.cpp:1306 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "Նոր թղթապանակ" @@ -5008,27 +5090,27 @@ #: ../../locales/../src/interface/filteredit.cpp:131 msgid "New filter" -msgstr "Նոր ֆիլտր" +msgstr "Նոր զտիչ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:909 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" 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:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Նոր կայք" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" -msgstr "Առաջադրանքների պատուհանի մոտ" +msgstr "Փոխանցման հաջորդ հերթականությունը" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Ոչ" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Չկա հասցեի հետ ասոցացված ծրագիր" @@ -5036,51 +5118,51 @@ msgid "No category to export selected" msgstr "Ընտրված չէ արտածման բաժինը" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Չկա նշված հրաման։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3753 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Արտաքին IP հասցեն նշված չէ։ Օգտագործում է ծրագրայինը։" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." 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 msgid "No host given, please enter a host." -msgstr "Նշեք հոսթը։" +msgstr "Մուտքագրեք հոսթը։" #: ../../locales/../src/interface/settings/optionspage_themes.cpp:87 msgid "No images available" msgstr "Չկան հասանելի նկարներ" -#: ../../locales/../src/interface/QueueView.cpp:2991 +#: ../../locales/../src/interface/QueueView.cpp:2974 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 "Նշված է ֆիլտրերի անունը։" +msgstr "Նշված է զտիչների անունը։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Չկա այս ֆայլերի հետ ասոցացված ծրագիր։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2892 +#: ../../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:1066 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Չկա բաշխիչ հոսթի համար" @@ -5088,41 +5170,41 @@ 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:484 msgid "No supported SOCKS5 auth method" msgstr "Չի աջակցվում SOCKS5 եղանակը" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:101 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:59 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Ոչ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Ոչինչ չի ընտրված" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/socket.cpp:1073 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:870 -#: ../../locales/../src/interface/queue.cpp:957 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1271 +#: ../../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 "Նորմալ" @@ -5131,16 +5213,16 @@ msgid "Not all items could be requeued for transfer." msgstr "Ոչ բոլոր ֆայլերն են հասանելի փոխանցման համար:" -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../../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:571 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Կապակցված չէ սպասարկիչին։" @@ -5148,11 +5230,11 @@ msgid "Not connected." msgstr "Կապակցված չէ։" -#: ../../locales/../src/engine/socket.cpp:1107 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Չի սկզբնավորվել, պետք է կանչի WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:657 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Ուշադրություն. Այս հնարավորությունը աջակցվում է միայն FTP եղանակի դեպքում։" @@ -5195,16 +5277,16 @@ #: ../../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/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" @@ -5220,7 +5302,7 @@ "well as the fallback mode if enabled." msgstr "Ընտրված եղանակը կկազմաձևևի հաջորդ էջերում։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Մեկ անգամ" @@ -5232,11 +5314,11 @@ msgid "Once a week" msgstr "Շաբաթը մեկ անգամ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:525 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Only use plain FTP (insecure)" msgstr "Օգտագործել միայն սովորական FTP" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Բացել թղթապանակը՝ համակարգային file manager-ում" @@ -5264,10 +5346,10 @@ 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:1616 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/LocalListView.cpp:1712 msgid "Opening failed" msgstr "Հնարավոր չէ բացել" @@ -5282,25 +5364,25 @@ #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:70 msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." -msgstr "Բացում է թղթապանակների ցանկի ֆիլտրի պատուհանը։" +msgstr "Բացում է թղթապանակների ցանկի զտիչի պատուհանը։" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 msgid "Operating System:" msgstr "Օպերացիոն համակարգ." -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Գործողությունը արդեն ընթացքի մեջ է" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Գործողությունը կատարվում է" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Հրամանը չի աջակցում" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Կապմակերպությունը." @@ -5308,16 +5390,16 @@ msgid "Other SFTP options" msgstr "Այլ SFTP ընտրանքներ" -#: ../../locales/../src/engine/socket.cpp:1102 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Համակարգային այլ սխալ" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Այլ." -#: ../../locales/../src/engine/socket.cpp:1052 -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Հիշողությունը քիչ է" @@ -5365,7 +5447,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Փոխարինել, եթե տարբերվում է չա&փով կամ ավելի նոր է" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Սեփական մշակման տեսակը. %s\n" @@ -5388,9 +5470,9 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:555 #: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" -msgstr "Միջնորդի հոսթը." +msgstr "Պրոքս&իի հոսթը." -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT հրամանը արգելված է router-ի կամ firewall-ի կողմից։" @@ -5398,18 +5480,18 @@ msgid "Pa&ssive (recommended)" msgstr "Պաս&սիվ (խորհուրդ է տրվում)" -#: ../../locales/../src/interface/Mainfrm.cpp:2376 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Ընդունելի URL հասցե չէ" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Վերլուծում է տարբերակի մասին տեղեկության %d բայթը:\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../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 "Գաղտնա&բառը." @@ -5422,39 +5504,39 @@ 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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:621 msgid "Passive mode has been set as default transfer mode." msgstr "Պասիվ եղանակը հաստատված է որպես ծրագրային" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:272 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Պահանջվում է գաղտնաբառ" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 #: ../../locales/../src/interface/search.cpp:109 msgid "Path" -msgstr "Ճանապարհը" +msgstr "Ուղի" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3053 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2205 +#: ../../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 "Հնարավոր չէ նշել %s թղթապանակի և %s ենթաթղթապանակի ճանապարհը" +msgstr "Հնարավոր չէ նշել %s թղթապանակի և %s ենթաթղթապանակի ուղին" -#: ../../locales/../src/interface/Mainfrm.cpp:2334 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Ճ-ը չի գտնվել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" -msgstr "Ճանապարհներ" +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:1111 +#: ../../locales/../src/interface/edithandler.cpp:1248 +#: ../../locales/../src/interface/edithandler.cpp:1338 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Pending removal" msgstr "Սպասում է ջնջման" @@ -5462,8 +5544,8 @@ msgid "Permission" msgstr "Իրավունք" -#: ../../locales/../src/engine/socket.cpp:1045 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Մուտք չկա" @@ -5476,7 +5558,7 @@ msgid "Platform:" msgstr "Սարքահիմքը." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5492,11 +5574,11 @@ "Կարգավորեք firewall-ը և router-ը այնպես, որ FileZilla-ն կարողանա միանա " "պատահական պորտերի միջոցով։" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "Անջատեք 'DMZ' և 'Խաղային' եղանակները Ձեր router-ում։" -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5508,7 +5590,7 @@ #: ../../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 msgid "" @@ -5519,74 +5601,75 @@ #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #, 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 msgid "Please enter a new name for the copied filter." -msgstr "Նշեք պատճենված ֆիլտրի անունը։" +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\"" +msgstr "Մուտքագրեք նոր զտիչների անունը։ \"%s\"" #: ../../locales/../src/interface/filteredit.cpp:196 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 "Նշեք սպասարկիչ միաժամանակյա փոխանցումների քանակը (0-10)։" +msgstr "Մուտքագրեք սպասարկիչ միաժամանակյա փոխանցումների քանակը (0-10)։" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:258 msgid "Please enter a password for this server:" -msgstr "Նշեք գաղտնաբառ՝ այս սպասարկիչի համար." +msgstr "Մուտքագրեք գաղտնաբառ՝ այս սպասարկիչի համար." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../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" -"Կարող եք նաև նշել այլ ճանապարհ։" +"Նշեք ծրագրի ուղի։\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՝ չկա դադար)։" +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 "Նշեք նոր անուն այս ֆիլտրերի համար" +msgstr "Մուտքագրեք նոր անուն այս զտիչների համար" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:265 msgid "Please enter a username for this server:" -msgstr "Նշեք օգտատերի անունը այս սպասարկիչում." +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 "Նշեք այն URL-ն, որից պետք է վերցվի Ձեր արտաքին IP հասցեն" @@ -5594,37 +5677,38 @@ #: ../../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/վ։" +msgstr "" +"Մուտքագրեք վերբեռնման արագության սահմանափակում բարձր կամ հավասար 0 %s/վ։" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." msgstr "" -"Նշեք raw FTP հրաման։\n" +"Մուտքագրեք raw FTP հրաման։\n" "raw ftp հրամանի օգտագործումը կմաքրի հիշոցը։" -#: ../../locales/../src/interface/LocalListView.cpp:897 +#: ../../locales/../src/interface/LocalListView.cpp:902 #: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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 "Նշեք թղթապանակի անունը." +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 "Նշեք ֆայլի անունը." +msgstr "Մուտքագրեք ֆայլի անունը." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:272 msgid "Please enter username and password for this server:" -msgstr "Նշեք օգտատերի անունը և գաղտնաբառը այս սպասարկիչի համար." +msgstr "Մուտքագրեք օգտատերի անունը և գաղտնաբառը այս սպասարկիչի համար." -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" -msgstr "Նշեք Ձեր արտաքին IP հասցեն" +msgstr "Մուտքագրեք Ձեր արտաքին IP հասցեն" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5642,7 +5726,7 @@ "Ուշադրությամբ հետևեք ցուցումներին, քանի որ սխալ կազմաձևումը կազդի FTP " "կապակցումների վրա։" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5650,11 +5734,11 @@ "Համոզվեք, որ FileZilla-ն ունի կապակցումներ հաստատելու իրավունք և գրված " "հասցեն ճիշտ է։" -#: ../../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 "Համոզվեք, որ այս լեզվի ֆայլը տեղակայված է համակարգչում։" -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5672,7 +5756,7 @@ "FileZilla չի կարող ազդել սպասարկիչի ընտրության վրա։ Սպասարկիչը կարող է " "ընտրել պորտ, որը firewall-ը բնորոշել է որպես վտանգավոր և կողպել է այն։" -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../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." @@ -5688,7 +5772,7 @@ "Հաշվի առեք այն, որ որոշ սպասարկիչներ կարող են արգելակել կապը, եթե " "կապակցումների միջև դադարը շատ կարճ լինի։" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5697,7 +5781,7 @@ "Կրկին բացեք Օգնականը, եթե փոխել եք ցանցային կարգավորումները կամ եթե ծագում " "են խնդիրներ այն սպասարկիչի հետ, որին նախկինում նորմալ կապակցել եք։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Ձեր քայլը." @@ -5732,7 +5816,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Ընտրեք նոր հատկանիշներ ընտրված ֆայլերի համար։" -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5745,8 +5829,8 @@ msgid "Positio&n of the message log:" msgstr "Հաղորդագրությունների տողի դիր&քը." -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "Փոստային ինդեքսը." @@ -5758,12 +5842,12 @@ msgid "Preallocation" msgstr "Նախաբաշխւմ" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1791 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Որոշված կայքերը" -#: ../../locales/../src/interface/Mainfrm.cpp:696 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Պահպանվում է ֆայլերի ստեղծման ժամանակը" @@ -5771,7 +5855,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 "Հիմնական կապակցման և տվյալների ալիքի վկայագրերը չեն համապատասխանում։" @@ -5787,7 +5871,7 @@ msgid "Prioritize directories (default)" msgstr "Թղթապանակների առաջնայնությունը" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Առաջնայնությունը" @@ -5810,28 +5894,28 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:578 #: ../../locales/../src/interface/resources/xrc/settings.xrc:775 msgid "Pro&xy password:" -msgstr "&Միջնորդի գաղտնաբառը." +msgstr "&Պրոքսիի գաղտնաբառը." #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 #: ../../locales/../src/interface/resources/xrc/menus.xrc:338 msgid "Process &Queue" -msgstr "Կատարել &առաջադրանքը" +msgstr "Կատարել &հերթականությունը" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Ֆայլի աղյուսակը լրացել է" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:90 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 #, c-format msgid "Processed %s in %s." msgstr "Կատարված է %s-ը %s-ում:" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Արջանագրությունը չի աջակցում" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Արձանագրությունը չի աջակցում բնիկի տեսակը" @@ -5846,38 +5930,42 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:568 #: ../../locales/../src/interface/resources/xrc/settings.xrc:765 msgid "Proxy &user:" -msgstr "Միջնորդի &օգտատերը." +msgstr "Պրոքսի &օգտատեր." -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" -msgstr "Միջնորդի ներկայացումը ձախողվեց" +msgstr "Պրոքսիի իսկորոշումը ձախողվեց" -#: ../../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 "Հնարավոր չէ կապակցել %s պրոքսին" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4208 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." -msgstr "Միջնորդ հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։" +msgstr "Պրոսքի հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։" -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" -msgstr "Միջնորդի պատասխանը. %s" +msgstr "Պրոքսիի պատասխանը. %s" + +#: ../../locales/../src/engine/proxy.cpp:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Պրոքսի հարցման ձախողում. Պրոքսիի պատասխանը. %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" -msgstr "Միջնորդի հարցման սխալ. %s" +msgstr "Պրոքսիի հարցման սխալ. %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" -msgstr "Միջնորդի հարցման սխալ. Հասցեի անհայտ տեսակ CONNECT պատասխանում" +msgstr "Պրոքսիի հարցման սխալ. Հասցեի անհայտ տեսակ CONNECT պատասխանում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Նշված է պրոքսի, բայց պրոքսի հոսթը և պորտը սխալ են" @@ -5893,32 +5981,32 @@ msgid "Public permissions" msgstr "Հրապարակային իրավունք" -#: ../../locales/../src/interface/QueueView.cpp:3071 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" -msgstr "Առաջադրանքը ավարտվել է" +msgstr "Հերթականությունը կատարված է" #: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" -msgstr "Առաջադրանք. %s ՄԲ" +msgstr "Հերթականություն. %s ՄԲ" #: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" -msgstr "Առաջադրանք. %s%s" +msgstr "Հերթականություն. %s%s" #: ../../locales/../src/interface/statusbar.cpp:362 #: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" -msgstr "Առաջադրանք. դատարկ է" +msgstr "Հերթականություն. դատարկ է" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" -msgstr "Ֆայլեր հերթում" +msgstr "Ֆայլեր, որոնք հերթում են" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" -msgstr "Առաջադրանք." +msgstr "Հերթականություն." #: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "R&eboot system" @@ -5926,14 +6014,14 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" -msgstr "Հ&եռադիր թղթապանակների ցանկը" +msgstr "Հ&եռակա թղթապանակների ցանկ" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" -msgstr "Մա&քրել ցանկը և ավելացնել ֆայլերը հերթում" +msgstr "Մա&քրել ցանկը և կրկնել նշված ֆայլերը" -#: ../../locales/../src/interface/Mainfrm.cpp:596 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Raw FTP-ի հրաման" @@ -5948,9 +6036,9 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 msgid "Re&name" -msgstr "Ան&վանափոխել" +msgstr "Վեր&անվանել" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5965,12 +6053,12 @@ msgid "Read-only" msgstr "Միայն կարդալ" -#: ../../locales/../src/interface/Mainfrm.cpp:1033 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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 "" @@ -5978,33 +6066,33 @@ msgstr[0] "Ջնջե՞լ %d թղթապանակը սպասարկիչից։" msgstr[1] "Ջնջե՞լ %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 ֆայլը սպասարկիչից։" msgstr[1] "Ջնջե՞լ %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:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Պատճառը" -#: ../../locales/../src/interface/QueueView.cpp:3064 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Վերամեկնարկել այժմ" @@ -6012,36 +6100,36 @@ msgid "Rec&urse into subdirectories" msgstr "Վերա&ուղղորդել ենթաթղթապանակներ" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ստացվել է TLS տագնապ հետևյալ սպասարկիչից՝ %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2964 +#: ../../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:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../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:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Ընդունված տվյալները սխալ էեն" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Ստացել է սխալ գրանշան տարբերակի մասին" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ստացվել է անհայտ %d TLS տագնապ սպասարկիչից" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Ստացված տեղեկությունը շատ մեծ է" @@ -6063,25 +6151,25 @@ msgid "Reconnects to the last used server" msgstr "Միանալ վերջին օգտագործված սպասարկիչին" -#: ../../locales/../src/interface/recursive_operation_status.cpp:72 +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 msgid "Recursively adding files to queue." -msgstr "Ֆայլերը ռեկուրսիվ ավելացվում են հերթում" +msgstr "Ֆայլերը ռեկուրսիվ ավելացվում են հերթականությանը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:78 +#: ../../locales/../src/interface/recursive_operation_status.cpp:98 msgid "Recursively changing permissions." msgstr "Թույլտվությունների ռեկրուսիվ փոփոխում:" -#: ../../locales/../src/interface/recursive_operation_status.cpp:75 +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 msgid "Recursively deleting files and directories." msgstr "Ֆայլերի և թղթապանակների ռեկրուսիվ ջնջում:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Վերաուղղում սխալ կամ չաջակցվող հասցեի. %s" @@ -6091,38 +6179,38 @@ msgid "Refresh the file and folder lists" msgstr "Թարմացնել ֆայլերի և թղթապանակների ցանկը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "&Հիշե՞լ գաղտնաբառը" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" -msgstr "Հեռադիր" +msgstr "Հեռակա" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 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:2275 +#: ../../locales/../src/interface/queue.cpp:1210 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/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 "Հեռադիր ֆայլերի փնտրում" +msgstr "Հեռակա ֆայլերի որոնում" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" -msgstr "Հեռադիր ֆիլտրեր." +msgstr "Հեռակա զտիչներ." -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" -msgstr "Հեռադիր ճանապարհը" +msgstr "Հեռակա ուղի" #: ../../locales/../src/interface/bookmarks_dialog.cpp:414 #, c-format @@ -6130,48 +6218,47 @@ "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: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 "" -"Հնարավոր չէ որոշել հեռակա ճանապարհը։ Համոզվեք, որ ընտրված ճանապարհը ճիշտ է և " -"այն աջակցվում է սպասարկիչի կողմից (%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/sitemanager_dialog.cpp:1117 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:332 msgid "Remote path could not be parsed." -msgstr "Հնարավոր չէ որոշել հեռակա ճանապարհը։" +msgstr "Հնարավոր չէ որոշել հեռակա ուղին։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" -msgstr "Հեռադիր ֆայլի ճանապարհը." +msgstr "Հեռակա ուղու նկարագրում." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" -msgstr "Հեռադիր ճանապարհը." +msgstr "Հեռակա ուղի." #: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" -msgstr "Ճանապարհը." +msgstr "Հեռակա ուղի." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" msgstr "Ջնջել &բոլորը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" msgstr "Ջնջել &ընտրվածը" @@ -6179,12 +6266,12 @@ #: ../../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/asyncrequestqueue.cpp:292 msgid "Rename file" -msgstr "Անվանափոխել ֆայլը" +msgstr "Վերանվանել ֆայլը" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Rename selected directory" msgstr "Փոխել ընտրված թղթապանակի անունը" @@ -6193,65 +6280,65 @@ msgid "Rename selected files and directories" msgstr "Փոխել ընտրված թղթապանակների և ֆայլերի անունները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3392 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" -msgstr "Անվանափոխում '%s'-ը '%s'-ի" +msgstr "Վերանվանում՝ '%s'-ը '%s'-ի" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3405 +#: ../../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:398 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:401 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:395 msgid "Request rejected or failed" msgstr "Հարցումը մերժվել է կամ ձախողվել" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" -msgstr "Մաքրել ցանկը և վերականգնել ֆայլերը &հերթում" +msgstr "Մաքրել ցանկը և կրկնել &բոլորը" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Ուղղված արձանագրությունը անհայտ է" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "%s-ի համար որոշվում է IP հասցեն" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1043 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:113 +#: ../../locales/../src/interface/netconfwizard.cpp:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Պատասխանը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3075 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Արդյունքները." @@ -6267,22 +6354,22 @@ "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/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Ստանում է \"%s\"-ի թղթապանակների կառուցվածքը..." #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Ստանում է թղթապանակների կառուցվածքը..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3768 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Ստանում է արտաքին IP հասցեն %s-ից" @@ -6299,7 +6386,7 @@ msgid "S&hutdown system" msgstr "Ան&ջատել համակարգիչը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Դադարեցնել" @@ -6319,7 +6406,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 պրոքսին կկապակցի %s-ին" @@ -6328,39 +6415,39 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Պահպանե՞լ կարգավորումները։" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:962 +#: ../../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/sitemanager_dialog.cpp:964 +#: ../../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:1718 +#: ../../locales/../src/interface/QueueView.cpp:1710 msgid "Scanning for files to add to queue" -msgstr "Փնտրվում են ֆայլեր, որոնք կավելացվեն հերթին" +msgstr "Փնտրվում են ֆայլեր, որոնք կավելացվեն" -#: ../../locales/../src/interface/QueueView.cpp:1720 +#: ../../locales/../src/interface/QueueView.cpp:1712 msgid "Scanning for files to upload" msgstr "Փնտրվում են ֆայլեր, որոնք վերբեռնվելու են" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3003 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Որոնման &պայմանները." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2984 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Փնտրել &թղթապանակ." #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." -msgstr "Ֆայլերի ինքնականչ փնտրում։" +msgstr "Ֆայլերի ինքնականչ որոնում։" #: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" @@ -6370,12 +6457,12 @@ msgid "Security information" msgstr "Տեղեկություն անվտանգության մասին" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 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:2353 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Ընտր&եք սպասարկիչը" @@ -6393,7 +6480,7 @@ msgstr "" "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյություն ունի։" -#: ../../locales/../src/interface/edithandler.cpp:1532 +#: ../../locales/../src/interface/edithandler.cpp:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Ընտրեք ծրագրային խմբագիրը" @@ -6414,48 +6501,49 @@ "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյությւոն ունի։ " "Միայն ընտրված ֆայլերի համար։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:347 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Ընտրեք գաղտնի կոդով ֆայլը" #: ../../locales/../src/interface/export.cpp:38 msgid "Select file for exported data" -msgstr "Ընտրեք ֆայլը՝ տվյալները արտածելու համար" +msgstr "Ընտրեք տվյալները արտահանելու ֆայլը" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" -msgstr "Ընտրեք ֆայլը՝ հերթի ֆայլերը արտածելու համար" +msgstr "Ընտրեք հերթականության ֆայլերը արտահանելու ֆայլը" #: ../../locales/../src/interface/export.cpp:36 msgid "Select file for exported settings" -msgstr "Ընտրեք ֆայլը՝ կարգավորումները արտածելու" +msgstr "Ընտրեք ֆայլերը արտահանելու ֆայլը" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" -msgstr "Ընտրեք ֆայլը՝ կայքերը արտածելու համար" +msgstr "Ընտրեք ֆայլը՝ կայքերը արտահանելու համար" #: ../../locales/../src/interface/import.cpp:16 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/settings/optionspage_connection_sftp.cpp:294 -msgid "Select filename for converted keyfile" -msgstr "Ընտրեք ֆայլի անունը" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" +msgstr "Ընտրեք փոխարկված բանալու ֆայլի անունը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../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 "Ընտրեք բեռնման թղթապանակը" +msgstr "Ընտրեք ներբեռնելու թղթապանակը" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Ընտրեք ֆայլի անունը" @@ -6467,7 +6555,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." @@ -6481,7 +6569,7 @@ msgstr[0] "Ընտրված է %d թղթապանակ։" msgstr[1] "Ընտրված են %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." @@ -6502,7 +6590,7 @@ msgstr[0] "Ընտրված է %d ֆայլ։ Չափը՝ ամենաքիչը %s" msgstr[1] "Ընտրված են %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։" @@ -6517,8 +6605,8 @@ msgid "Selected %s and %s. Total size: At least %s" msgstr "Ընտրված են %s և %s։ Չափը ոչ քիչ քան՝ %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../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 "Ընտրված խմբագիրը գոյություն չունի։" @@ -6528,21 +6616,21 @@ msgid "Selected file already being edited" msgstr "Ընտրված ֆայլը արդեն խմբագրվում է" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "Ընտրված ֆայլը արդեն բացված է" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "Ընտրված ֆայլը արդեն բացված է" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1720 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 "Ընտրված ֆիլտրը վերաբերում է միայն համակարգչային ֆայլերին։" +msgstr "Ընտրված զտիչը վերաբերում է միայն համակարգչային ֆայլերին։" #: ../../locales/../src/interface/menu_bar.cpp:304 msgid "" @@ -6565,34 +6653,34 @@ msgid "Send custom command to the server otherwise not available" msgstr "Պետք է ուղարկել անհատական հրաման սպասարկիչին" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Ուղարկվում է FTP &ակտիվության հրաման" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Serial number:" msgstr "Սերիական համարը." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "Սպասարկիչի &տեսակը." -#: ../../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:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Սպասարկիչը չի աջակցում ոչ-ASCII նիշեր:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Սպասարկիչը չի աջակցում ֆայլեր %d ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4145 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6607,38 +6695,38 @@ msgid "Server does not support resume of files > 4GB." msgstr "Սպասարկիչը չի աջակցում 4ԳԲ-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 +#: ../../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 "Սպասարկիչը չի աջակցում %d-ից մեծ ֆայլեր։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "" -"Սպասարկիչը հնարավոր է պահանջի գործածողի անուն։ Որոշեք այն Կայքերի կառավարիչի " -"միջոցով" +"Սպասարկիչը հնարավոր է պահանջի Հաշիվի անուն։ Փորձեք հատկորոշել այն Կայքերի " +"կառավարիչի միջոցով" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." -msgstr "Սպասարկիչը վերադարձրել է դատարկ ճանապարհ։" +msgstr "Սպասարկիչը վերադարձրել է դատարկ ուղի։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../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:3715 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Սպասարկիչը ուղարկել է պասսիվ պատասխան՝ անորոշ հասցեով։ Պասիվ եղանակը " "չաշխատեց։" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6647,35 +6735,35 @@ "սպասարկիչի գործող հասցեն։" #: ../../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: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 "Սպասարկիչը ուղարկել է անորոշ պատասխան։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "MAC սպասառուի սպասարկիչը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Սպասարկիչի շիֆրը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Սպասարկիչի &տեսակը." -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Սպասարկիչը/Ֆայլը համակարգչում" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2339 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Սպասարկիչը." @@ -6687,13 +6775,13 @@ msgid "Set &Priority" msgstr "Հաստատել &առաջնայնությունը" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3540 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../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:791 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize կանչվել է առանց սոկեթը նշելու" @@ -6713,7 +6801,7 @@ msgid "Show &welcome dialog..." msgstr "Ցուցա&դրել ողջյունի պատուհանը..." -#: ../../locales/../src/interface/Mainfrm.cpp:2224 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Ցուցադրել թղթապանակների կառուցվածքը և շարունակել համեմատումը։" @@ -6725,7 +6813,7 @@ 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:441 msgid "Shows available TLS ciphers" msgstr "Հասանելի TLS չիպերները" @@ -6733,7 +6821,7 @@ msgid "Shows this help dialog" msgstr "Ցուցադրել օգնության այս պատուհանը" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Անջատել" @@ -6749,48 +6837,49 @@ msgid "Site Manager" msgstr "Կայքերի կառավարիչ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:970 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 msgid "Site Manager - Cannot remember password" 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: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: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 "Կայքերի կառավարիչ՝ սխալ տվյալներ" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:323 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 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-ով։" +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 "Սխալ ճանապարհ։" +msgstr "Սխալ ուղի։" #: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" @@ -6807,7 +6896,7 @@ "կառավարիչում։\n" "Ավելացնե՞լ գործող կապը Կայքերի կառավարիչում։" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Չափը" @@ -6826,43 +6915,43 @@ 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: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:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../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:1060 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Բնիկի հասցեն սահմանների դուրս է" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Կապակցել է" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Բնիկը անջատվել է" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Կապ չկա" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Բնիկի տեսակը չի աջակցում հասցեի ընտանիքի համար" -#: ../../locales/../src/interface/Mainfrm.cpp:1168 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Որոշ ֆայլեր խմբագրվում են կամ պահանջում են վերբեռնում սպասարկիչ։" @@ -6879,7 +6968,7 @@ msgid "Sort directories inline" msgstr "Դասավորել թղթապանակները մի գծով" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Դասավորման եղանակը չի կարող փոփոխվել թղթապանակները համեմատելիս։" @@ -6891,23 +6980,23 @@ msgid "Sorting &mode:" msgstr "Դասավոման &եղանակը." -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 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:138 msgid "Source and target file may not be the same" -msgstr "Աղբյուրը և նշանակման ճանապարհը չեն կարող նույնը լինել։" +msgstr "Աղբյուրը և թիրախ ֆայլը չեն կարող նույնը լինել։" #: ../../locales/../src/interface/RemoteListView.cpp:141 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/resources/xrc/dialogs.xrc:3639 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62 msgid "Speed Limits" @@ -6937,7 +7026,7 @@ msgid "Stable, beta and nightly versions" msgstr "Կայուն և փորձարկվող տարբերակներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2547 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Անհապաղ սկսել &փոխանցումը" @@ -6945,19 +7034,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:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1548 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Սկսվում է %s-ի բեռնումը" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1551 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Սկսվում է %s-ի վերբեռնումը" @@ -6966,18 +7055,18 @@ msgid "Starts the local site in the given path" msgstr "Սկսում է տեղային կայքը տրված ճ-ում" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Նահանգը կամպրովինցիան." -#: ../../locales/../src/interface/edithandler.cpp:1088 -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../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 "Գործողությունը." @@ -6985,11 +7074,11 @@ msgid "Stop and remove &all" msgstr "Կանգնեցնել և ջնջել &բոլորը" -#: ../../locales/../src/interface/recursive_operation_status.cpp:39 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 msgid "Stop recursive operation" msgstr "Կանգնեցնել ռեկրուսիվ գործ.-ը" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Փողոցը." @@ -7005,33 +7094,34 @@ msgid "Summary of test results:" msgstr "Թեստի արդյունքները." -#: ../../locales/../src/interface/QueueView.cpp:3068 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Անջատել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../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:3700 #: ../../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: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:930 +#: ../../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 "Համաժամանակեցված դիտում" -#: ../../locales/../src/interface/state.cpp:368 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Համաժամանակեցված դիտումը անջատվել է։" @@ -7045,8 +7135,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Սինթեքսի սխալ՝ հրամանի տողում" @@ -7058,11 +7148,11 @@ msgid "System details" msgstr "Մանրամասներ" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Բացված ֆայլերի համակարգային սա-ը գերազանցվել է" -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Համակարգի ցանցի ենթահամակարգը ձախողվել է" @@ -7070,19 +7160,19 @@ msgid "T&oolbar" msgstr "Գ&ործիքներ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS կապակցումը հաստատված է, ուղարկվում է HTTP հարցում" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS կապակցումը հաստատված է, սպասում է ողջյունի հաղորդագրություն..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS կապակցումը հաստատված է։" -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL ավարտվել է" @@ -7094,15 +7184,15 @@ 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:1081 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Ժամանակավոր ձախողում անվան ընդլայնման մեջ" @@ -7110,15 +7200,15 @@ msgid "Test results" msgstr "Թեստի արդյունքները" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4166 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" -msgstr "Ստուգվում է սպասարկիչից բեռնման հնարավորությունը" +msgstr "Ստուգվում է սպասարկիչից ներբեռնելու հնարավորությունը" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Կայքերի կառավարչը չի կարող օտագործվել, քանի դեռ ֆայլը վերականգնվում է:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:322 +#: ../../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 " @@ -7135,25 +7225,25 @@ "Կայքերի կառավարիչը օգտագործվում է FileZilla-ի այլ գործողության կողմից։ 3.\n" "Փակեք այն, տվյալները չեն ջնջվելու։" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" -msgstr "Դուք գրել եք %s հասցեն." +msgstr "Դուք գրել եք %s հասցե." -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "ai_family անդամը չի աջակցվում" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1087 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/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 "Հնարավոր չէ մաքրել էջանիշները։" @@ -7179,17 +7269,17 @@ "Նշված ամսաթիվի ձևաչափը սխալ է կամ պարունակում է չաջակցվող ձևաչափի " "հատկորոշիչներ:" -#: ../../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:2915 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../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:2908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "Տեքստային ֆայլերի հաստատված ծրագիր '%s'։" @@ -7198,25 +7288,25 @@ #: ../../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 "Նշված ֆիլտրի անունը արդեն առկա է: Ընտրեք այլ անուն:" +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: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" "Please enter a new name:" msgstr "" "%s ֆայլը գոյություն ունի։\n" -"Նշեք նոր անուն." +"Մուտքագրեք նոր անուն." -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7227,7 +7317,16 @@ "Համակցված ծրագիր (%s) չի գտնվել։\n" "Ստուգեք ասոցացումների կարգավորումները։" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:219 +#: ../../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' ֆայլում չկա անհրաժեշտ տեղեկություններ։" @@ -7237,8 +7336,8 @@ msgid "The file '%s' could not be loaded." msgstr "'%s' ֆայլը չի կարող բացվել։" -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7247,8 +7346,8 @@ "'%s' ֆայլը հնարավոր չէ բացել.\n" "Նշված չէ այս տիպի ֆայլերի հետ ասոցացված ծրագիր։" -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7258,7 +7357,7 @@ "Հրամանը չի աշխատել" #: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7269,19 +7368,7 @@ "Նմանատիպ ֆայլերի բեռնումը կարող է հանգեցնել ֆայլերի կորստի:\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 "" -"'%s' ֆայլի տեսակը FileZilla-ն չի աջակցում։\n" -"Բացի դա ֆայլը կոդավորված է։\n" -"Փոխե՞լ այն այն տեսակի, որը FileZilla-ն աջակցում է։" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:258 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7290,16 +7377,6 @@ "'%s' ֆայլի տեսակը FileZilla-ն չի աջակցում։\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" -"Փոխե՞լ այն ոչ պաշտպանված ֆայլի։" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Ընտրված խմբագիրը գոյություն չունի։" @@ -7338,7 +7415,7 @@ msgid "The following files are currently being edited:" msgstr "Խմբագրվում են հետևյալ ֆայլերը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3283 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Ազատ, բաց կոդով FTP ծրագիր" @@ -7360,7 +7437,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Պետք է լինի 1-ի և 2000 ՄԲ-ի միջև" -#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:973 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Տեղային '%s' թղթապանակը չի կարող ստեղծվել։" + +#: ../../locales/../src/interface/state.cpp:958 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Տեղային '%s' թղթապանակը գոյություն չունի։" + +#: ../../locales/../src/interface/state.cpp:250 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7370,7 +7457,7 @@ "սխեմայից (%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." @@ -7386,17 +7473,22 @@ msgid "The new version has been saved in your Downloads directory." msgstr "Նոր տարբերակը ներբեռնվել է Downloads թղթապանակում:" -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "Հերթականությունը չի կարող պահպանվել։" -#: ../../locales/../src/interface/state.cpp:906 +#: ../../locales/../src/interface/state.cpp:885 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Հեռակա '%s' թղթապանակը գոյություն չունի։" + +#: ../../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 "" -"'%s' հեռակա թղթապանակը համաժամանակեցման ճանապարհից վեր է (%s)։\n" +"'%s' հեռակա թղթապանակը համաժամանակեցման արմատից վեր է (%s)։\n" "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել փոփոխել հեռակա թղթապանակը։" #: ../../locales/../src/interface/import.cpp:76 @@ -7413,12 +7505,12 @@ msgid "The selected file is already being edited:" msgstr "Ընտրված ֆայլը արդեն խմբագրվում է." -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1720 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:1626 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7428,15 +7520,15 @@ "Դա վտանգավոր է և կարող է վնասել համակարգը։\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:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Սպասարկիչը ուղարկել է անհայտ պատասխան։" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "The server uses following charset encoding for filenames:" msgstr "Սպասարկիչի կողմից օգտագործվող կոդավորումը." @@ -7461,7 +7553,7 @@ "the computer you think it is." msgstr "Սպասարկիչի հոսթի բանալին հայտնի չէ։ Հնարավոր է սա այլ սպասարկիչ է։" -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Սպասարկիչի անվան ցուցիչը չի աջակցվում ai_socktype-ի համար" @@ -7473,19 +7565,19 @@ "Կարգավորումները ներմուծվել են։ Վերամեկնարկեք FileZilla-ն՝ դրանք կիրառելու " "համար։" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Հասցեի նշված ընտանիքը չի աջակցում" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Ցանցի նշված անունը այլևս հասանելի չէ" -#: ../../locales/../src/interface/QueueView.cpp:3063 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "Համակարգիչը կվերամեկնարկի, եթե Դուք չսեղմեք 'Չեղարկել'։" -#: ../../locales/../src/interface/QueueView.cpp:3059 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Համակարգիչը կանջատվի, եթե չսեղմեք 'Չեղարկել'։" @@ -7497,7 +7589,7 @@ "Ֆայլւժը արդեն գոյություն ունի։.\n" "Ինչ անել։" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Թեստը անհաջող էր։ Պահպանե՞լ կարգավորումները։" @@ -7510,15 +7602,15 @@ msgid "Themes" msgstr "Թեմաներ" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." -msgstr "Ֆիլտրերի խումբը հնարավոր չէ ջնջել։" +msgstr "Զտիչների խումբը հնարավոր չէ ջնջել։" -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." -msgstr "Ֆիլտրերի խումբը հնարավոր չէ անվանափոխել։" +msgstr "Զտիչների խումբը հնարավոր չէ վերանվանել։" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7539,7 +7631,7 @@ "you have and tests your configuration." msgstr "Այս Օգնականը կօգնի Ձեզ ճիշտ կարգավորել router և firewall ծրագրերը։" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Ժամանակը" @@ -7552,26 +7644,26 @@ msgstr "Սպասելու &ժամանակը՝ վայր." #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Սպասելու ժամանակը" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1022 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Ժամային գոտու տարբերությունը սպասարկիչի հետ %d վայրկյան է:" -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Անունը." -#: ../../locales/../src/interface/Mainfrm.cpp:2222 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Համեմատելու համար թղթապանակները երկու կողմն էլ պետք է լինեն հավասարեցված։" -#: ../../locales/../src/interface/Mainfrm.cpp:2223 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "Սրա համար թղթապանակների հենքը պետք է կամ թաքցված լինեն կամ միացված։" @@ -7611,7 +7703,7 @@ #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:46 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:47 msgid "Toggles processing of the transfer queue" -msgstr "Ցուցադրել/Թաքցնել առաջադրանքի կատարման ընթացքը" +msgstr "Ցուցադրել/Թաքցնել հերթականության կատարման ընթացքը" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:22 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:24 @@ -7633,17 +7725,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Ցուցադրել/Թաքցնել ֆայլերի հերթականությունը" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Շատ երկար է" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../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 "Ուղեգծում." @@ -7652,7 +7744,7 @@ msgid "Transfer" msgstr "Փոխանցվում է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "Փոխանցման &տեղը" @@ -7668,21 +7760,21 @@ msgid "Transfer Queue" msgstr "Հերթականության պատուհանը" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 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:630 msgid "Transferred data got tainted." msgstr "Փոխանցված տվյալները վնասված են։" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Փոխանցվում է" @@ -7691,8 +7783,8 @@ msgid "Transfers" msgstr "Փոխանցումներ" -#: ../../locales/../src/interface/QueueView.cpp:2961 -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2944 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "Transfers finished" msgstr "Փոխանցումները ավարտվել են" @@ -7704,11 +7796,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Հաշվել &ֆայլերը որպես ASCII" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Ընդունել հոսթի բանալու փոփոխությունը." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Հոսթի նոր բանալի." @@ -7729,8 +7821,8 @@ 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:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Տեսակը" @@ -7740,13 +7832,13 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" -msgstr "Բազային պրոքսի տեսակը." +msgstr "Ընդհանուր պրոքսիի տեսակը." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "Վ&երբեռնել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Վ&երբեռման սահմանափակում." @@ -7756,35 +7848,35 @@ msgstr "Բացելու համար օգտագործել ֆայլերի ասոցացումները" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Օ&գտագործել համակարգային կարգավորումներ" +msgid "U&se system defaults for current language" +msgstr "Ընթացիկ լեզվի համար օգ&տ. լռելյայնը" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "ՕԳՏԱՏԵՐԸ@&ՀՈՍԹԸ" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Սխալի անորոշ կոդ %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Օբյեկտը." -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Անհայտ է" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "FTP պրոքսի անհայտ տեսակ, հնարավոր չէ ստեղծել անհրաժեշտ հաջորդականությունը " "մուտքի համար։" -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "SOCKS արձանագրության անհայտ տեսակ. %d" @@ -7797,7 +7889,7 @@ msgid "Unknown host key" msgstr "Անհայտ բանալի" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7809,8 +7901,8 @@ "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: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." @@ -7818,7 +7910,7 @@ "Եթե խնդիրները չլուծվեն, FTP-ի ակտիվ եղանակը չի աշխատի և անհրաժեշտ կլինի " "օգտագործել պասիվ եղանակը։" -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -7826,11 +7918,11 @@ "Եթե խնդիրները չլուծվեն, FTP-ի ակտիվ եղանակը չի աշխատի և անհրաժեշտ կլինի " "օգտագործել պասիվ եղանակը։" -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Սերտիֆիկատի տեսակը չի աջակցվում" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Վերաուղղորդումը չի աջակցվում" @@ -7843,11 +7935,11 @@ msgid "Updates" msgstr "Թարմացումներ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Վերբեռնել" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "Անհաջող էր" @@ -7860,7 +7952,7 @@ msgid "Upload limit: none" msgstr "Սահմանափակումներ չկան" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Վերբեռնել ընտրված թղթապանակը" @@ -7876,23 +7968,23 @@ msgid "Upload this file to the server?" msgstr "Վերբեռնե՞լ ֆայլը սպասարկիչ։" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "Վերբեռնում է" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" msgstr "Վերբեռնվում է և սպասում է ջնջման" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" msgstr "Վերբեռնում առանց փոփոխությունների" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Օգտագործել &ընտրված կոդավորումը" @@ -7900,16 +7992,16 @@ msgid "Use &custom editor:" msgstr "Օգտագործել &հետևյալ խմբագրիչը." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Օգտագորխել &ծրագրային խմբագիրը" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2687 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Օգտագործել հ&ամաժամանակեցված դիտում" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "Օգտագործել UTF-8, եթե սպասարկիչը աջակցում է այն։" @@ -7918,21 +8010,21 @@ msgid "Use default action" msgstr "Օգտ հիմնական գործ." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 msgid "Use explicit FTP over TLS if available" msgstr "Օգտագործել պարզ FTP TLS-ով, եթե հասանելի է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Օգտագործել սպասարկիչ, որը միացրած է" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Օգտագործել սպասարկիչ Կայքերի կառավարիչից" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Օգտագործել համակարգային &կարգավորումները" +msgid "Use system &defaults for current language" +msgstr "Ընթացիկ լեզվի համար օգտ. &լռելյայնը" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -7967,12 +8059,12 @@ msgid "User:" msgstr "Օգտատերը." -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "Օգտատերի անունը չի կարող ունենալ միայն բացեր" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:514 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -7990,7 +8082,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "wxWidgets-ի հաղորդագրություն" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Ստուգվում է վկայագիրը..." @@ -8006,7 +8098,7 @@ msgid "View/Edit" msgstr "Դիտել/Խմբագրել" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Տեսանելի սյուներ" @@ -8014,15 +8106,15 @@ msgid "W&rite" msgstr "Գ&րել" -#: ../../locales/../src/interface/QueueView.cpp:1678 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "Սպասում" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Սպասում է կապակցման" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Ստուգվում է գաղտնաբառը" @@ -8034,7 +8126,7 @@ msgid "Waiting to retry..." msgstr "Սպասում է կրկնման..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Ուշադրություն, անտեսվում է կապակցումը սխալ IP-ից։" @@ -8058,11 +8150,11 @@ msgid "Warning: Potential security breach!" msgstr "Ուշադրություն. Առկա է անվտանգության չեղք։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Բարի Գալուստ FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Ինչն է նոր" @@ -8070,7 +8162,7 @@ msgid "What's new:" msgstr "Ինչն է նոր." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3637 +#: ../../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." @@ -8094,7 +8186,7 @@ msgid "Widescreen" msgstr "Լայնէկրան" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "Ցանկանու՞մ եք, որ FileZilla-ն հիշի գաղտնաբառերը:" @@ -8102,20 +8194,20 @@ msgid "Wr&ite" msgstr "Գր&ել" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Սխալ արտաքին IP հասցե" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Տողերի սխալ վերջավորություն" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Այո" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8125,7 +8217,7 @@ 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:3439 msgid "You can always open this dialog again through the help menu." msgstr "Կարող եք բացել այս պատուհանը Օգնություն ընտրացանկից։" @@ -8160,57 +8252,61 @@ "Հնարավոր չէ փոխել անընդունելի նշանը մեկ այլ անընդունելի նշանով։ Նշեք այնպես, " "ինչպես որ թույլատրվում է։" -#: ../../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 "Դուք չեք նշել ֆայլի նոր անունը։ Փոխարինե՞լ այն։" +msgstr "Դուք չեք մուտքագրել ֆայլի նոր անունը։ Փոխարինե՞լ այն։" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "Ընտրեք եք առնվազն մեկ հղում։" -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../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 "Խմբագրման համար դուք ընտրել եք 10 ֆայլից ավելի։ Շարունակե՞լ։" -#: ../../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 "" "Բացելու համար դուք ընտրել եք 10 ֆայլից կամ թղթապանակից ավելի։ Շարունակե՞լ։" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." -msgstr "Նշեք հոսթի անունը։" +msgstr "Մուտքագրեք հոսթի անունը։" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +msgid "You have to enter a key file path" +msgstr "Պետք է նշեք բանալու ֆայլի ուղին" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 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/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 "Նշեք թղթապանակ համակարգչում, որտեղ հնրավոր է պահպանել։" +msgstr "Մուտքագրեք թղթապանակ համակարգչում, որտեղ հնարավոր է պահպանել։" -#: ../../locales/../src/interface/manual_transfer.cpp:505 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 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: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:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8218,72 +8314,72 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:56 msgid "You need to enter a name for the bookmark." -msgstr "Նշեք էջանիշի անունը։" +msgstr "Մուտքագրեք էջանիշի անունը։" #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67 msgid "You need to enter a name for the log file." -msgstr "Նշեք log ֆայլի անունը։" +msgstr "Մուտքագրեք log ֆայլի անունը։" -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1472 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-ի միջև" +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/sitemanager_dialog.cpp:1127 msgid "You need to enter at least one path, empty bookmarks are not supported." -msgstr "Պետք է նշեք գոնե մեկ ճանապարհ, հնարավոր չէ նշել դատարկ էջանիշ։" +msgstr "Պետք է նշեք գոնե մեկ ուղի, հնարավոր չէ նշել դատարկ էջանիշ։" #: ../../locales/../src/interface/bookmarks_dialog.cpp:81 #: ../../locales/../src/interface/bookmarks_dialog.cpp:435 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098 +#: ../../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 "" -"Պետք է նշեք համակարգչային և հեռակա ճանապարհը՝ պատուհանի համաժամանակեցված " -"դիտումը ապահովելու համար։" +"Պետք է նշեք համակարգչային և հեռակա ուղի՝ պատուհանի համաժամանակեցված դիտումը " +"ապահովելու համար։" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1060 +#: ../../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 "" -"Պետք է նշեք համակարգչային և հեռակա ճանապարհը՝ այս կայքի համար " -"համաժամանակեցված դիտումը միացնելու համար։" +"Պետք է նշեք համակարգչային և հեռակա ուղին՝ այս կայքի համար համաժամանակեցված " +"դիտումը միացնելու համար։" -#: ../../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 "Նշեք հեռակա ճանապարհը։" +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:577 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:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Համակարգիչը կվերամեկնարկի, եթե չսեղմեք 'Չեղարկել'։" @@ -8308,7 +8404,7 @@ msgid "contains" msgstr "պարունակում է" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "հարմարեցված" @@ -8330,19 +8426,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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "ֆայլ" -#: ../../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:96 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../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 " @@ -8351,15 +8447,15 @@ "Հնարավոր չէ բացել fzputtygen-ը։\n" "Համոզվեք, որ ֆայլը գտնվում է այնտեղ, որտեղ որ FileZilla.ехе է։" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp-ն վերաբերում է FileZilla-ի այլ տարբերակին" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1475 +#: ../../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 չկան վկայագրեր" @@ -8415,11 +8511,11 @@ 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: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 "անհայտ" @@ -8439,6 +8535,43 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Deleting directories" +#~ 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 "Օ&գտագործել համակարգային կարգավորումներ" + +#~ msgid "Use system &defaults" +#~ msgstr "Օգտագործել համակարգային &կարգավորումները" + +#~ 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" +#~ "Բացի դա ֆայլը կոդավորված է։\n" +#~ "Փոխե՞լ այն այն տեսակի, որը FileZilla-ն աջակցում է։" + +#~ 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" +#~ "Փոխե՞լ այն ոչ պաշտպանված ֆայլի։" + #~ msgid "The XML document is not well-formed: %s" #~ msgstr "XML-ն ունի սխալ ձև՝ %s" diff -Nru filezilla-3.14.1/locales/id_ID.po filezilla-3.15.0.2/locales/id_ID.po --- filezilla-3.14.1/locales/id_ID.po 2015-09-09 14:05:02.000000000 +0000 +++ filezilla-3.15.0.2/locales/id_ID.po 2016-02-05 08:54:45.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: id_ID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2015-09-04 23:54+0700\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-28 01:43+0700\n" "Last-Translator: Willy Sudiarto Raharjo \n" "Language-Team: Bahasa Indonesia \n" "Language: id\n" @@ -13,7 +13,7 @@ "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.4\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 @@ -44,9 +44,9 @@ msgid_plural "%d directories" msgstr[0] "%d direktori" -#: ../../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" @@ -54,9 +54,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" @@ -74,12 +74,12 @@ msgid_plural "%d files. Total size: At least %s" msgstr[0] "%d berkas. Ukuran total: Paling tidak %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -116,7 +116,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikat kadaluarsa!" @@ -147,7 +147,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 " @@ -162,7 +162,7 @@ "Harap mendownload FileZilla kembali. Jika hal ini masih tetap ada, harap " "kirimkan laporan kesalahan." -#: ../../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 " @@ -179,7 +179,7 @@ "PATH Anda.\n" "- Tentukan path lengkap pada %s pada variabel lingkungan FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s dengan %d bit" @@ -193,7 +193,7 @@ msgid "%w - Proxy password" msgstr "%w - Kata sandi proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "B&atalkan koneksi sebelumnya dan buka koneksi pada tab aktual" @@ -246,7 +246,7 @@ msgid "&Always use default editor" msgstr "&Selalu gunakan editor default ini" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Selalu gunakan pilihan untuk semua berkas yang tidak diasosiasikan" @@ -284,9 +284,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 @@ -299,8 +299,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" @@ -373,14 +373,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 "&Hapus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Hapus symlink" @@ -388,14 +388,14 @@ msgid "&Directory comparison" msgstr "Perbandingan &direktori" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote." -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -422,7 +422,7 @@ msgid "&Display size in bytes" msgstr "&Tampilkan ukuran dalam byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Jangan mengingat kata kunci (direkomendasikan)" @@ -443,7 +443,7 @@ msgid "&Download" msgstr "&Download" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Download ke:" @@ -476,7 +476,7 @@ msgid "&Enable compression" msgstr "&Aktifkan kompresi" -#: ../../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 "&Aktifkan batas kecepatan" @@ -493,7 +493,7 @@ msgid "&Enter custom command..." msgstr "&Masukkan perintah sendiri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Buat kon&eksi pada tab baru" @@ -546,7 +546,7 @@ msgid "&Finish editing and delete local file" msgstr "&Selesaikan pengeditan dan hapus berkas lokal" -#: ../../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" @@ -554,7 +554,7 @@ "&Path remote lebih ramping, download semua berkas yang ada langsung pada " "direktori target" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Ikuti symlink, hapus isi direktori target" @@ -617,7 +617,7 @@ msgid "&Install new version" msgstr "&Install versi baru" -#: ../../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 "&Pertahankan struktur path remote relatif pada root pencarian" @@ -642,7 +642,7 @@ msgstr "Pohon direktori &lokal" #: ../../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 "Direktori &lokal:" @@ -706,11 +706,11 @@ msgid "&New Site" msgstr "&Situs Baru" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Versi baru tersedia!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Lanjut >" @@ -733,7 +733,7 @@ msgstr "&Nilai numerik:" #: ../../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 "&OK" @@ -810,12 +810,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Ingat Kata kunci sampai FileZilla ditutup" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Direktori remote:" @@ -836,7 +836,7 @@ msgstr "&Hapus yang dipilih" #: ../../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 @@ -897,7 +897,7 @@ msgid "&Save as..." msgstr "&Simpan sebagai..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Pencarian" @@ -966,7 +966,7 @@ msgid "&Speed limits" msgstr "&Batas kecepatan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Mulai transfer secepatnya" @@ -978,7 +978,7 @@ msgid "&TLS Ciphers" msgstr "&TLS Cipher" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Tes" @@ -1021,7 +1021,7 @@ msgid "&Uploads:" msgstr "&Upload:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Gunakan program kustomisasi" @@ -1055,7 +1055,7 @@ msgid "&Username:" msgstr "&Nama pengguna:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Versi %s" @@ -1101,12 +1101,12 @@ msgid "'%s' is not a directory." msgstr "'%s' bukan direktori." -#: ../../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 "Jenis login 'Akun' tidak didukung oleh protokol yang dipilih" -#: ../../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." @@ -1122,7 +1122,7 @@ "Jenis akun 'Normal' dan 'Account' tidak tersedia. Pilihan Anda telah " "berganti menjadi 'Tanyakan kata sandi'." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1179,8 +1179,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(contoh: %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 @@ -1239,7 +1239,7 @@ msgid "64-bit system" msgstr "Sistem 64-bit" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Kembali" @@ -1260,7 +1260,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Sebuah direktori tidak bisa dipindah pada salah satu sub direktorinya." @@ -1289,7 +1289,7 @@ msgstr "" "Berkas dengan nama tersebut masih diedit. Harap ditutup dan coba kembali." -#: ../../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 " @@ -1308,7 +1308,7 @@ msgid "A new version of FileZilla is available:" msgstr "Versi baru dari FileZilla sudah tersedia:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1325,7 +1325,7 @@ "Server yang benar tidak membutuhkan ini. Kontak administrator server jika " "Anda memerlukannya." -#: ../../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?" @@ -1379,11 +1379,11 @@ #: ../../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: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" @@ -1409,7 +1409,7 @@ msgid "Active mode" msgstr "Mode aktif" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1417,7 +1417,7 @@ "Pengujian mode aktif FTP gagal. FileZilla tidak tahu alamat IP eksternal " "yang benar." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1426,7 +1426,7 @@ "yang benar. Sebagai tambahan, router Anda telah memodifikasi alamat " "pengiriman." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1439,7 +1439,7 @@ msgid "Active mode IP" msgstr "IP mode aktif" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Tambahkan berkas ke hanya ke &antrian" @@ -1458,7 +1458,7 @@ msgid "Add to queue" msgstr "Tambahkan ke antrian" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Jenis alamat tidak didukung" @@ -1480,7 +1480,7 @@ "dan mungkin merusak sistem Anda. Gunakan versi beta dan build harian dengan " "resiko Anda sendiri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Selalu gunakan aksi ini" @@ -1488,7 +1488,7 @@ msgid "Algorithm:" msgstr "Algoritma:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Semua berkas telah berhasil ditransfer" @@ -1496,7 +1496,7 @@ 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:2946 +#: ../../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." @@ -1510,11 +1510,11 @@ 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:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Sudah terhubung" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nama alternatif:" @@ -1542,7 +1542,7 @@ msgstr "" "Alternatifnya, Anda bisa mendownload versi terbaru dari website FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1551,7 +1551,7 @@ "Sebuah kesalahan memuat antrian transfer dari \"%s\".\n" "Beberapa antrian mungkin belum dikembalikan." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1560,7 +1560,7 @@ "Sebuah kesalahan memuat antrian transfer ke \"%s\".\n" "Beberapa antrian mungkin belum dikembalikan." -#: ../../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." @@ -1569,16 +1569,16 @@ "pada lokasi target." #: ../../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/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 "Anonim" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1589,11 +1589,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Semua perubahan pada filter tidak akan disimpan." @@ -1617,7 +1617,7 @@ msgid "Archive" msgstr "Arsip" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Argument buffer overflow" @@ -1635,7 +1635,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Meminta kata sandi" @@ -1647,7 +1647,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Menanyakan pertanyaan pada forum FileZilla" @@ -1667,7 +1667,7 @@ msgid "Attribute" msgstr "Atribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Authentikasi gagal." @@ -1696,11 +1696,11 @@ msgid "B&ypass proxy" msgstr "L&ewati proxy" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Deskriptor berkas rusak" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Instruksi penggunaan dasar" @@ -1713,7 +1713,7 @@ msgid "Being edited" msgstr "Sedang diedit" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Hati-hati! Sertifikat sudah dibatalkan" @@ -1731,11 +1731,11 @@ msgid "Bookmark" msgstr "Penanda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Penanda:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Penanda" @@ -1751,7 +1751,7 @@ msgid "Build information" msgstr "Informasi pembuatan" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Kategori bisnis:" @@ -1791,22 +1791,22 @@ msgid "CPU features:" msgstr "Fitur CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Menkalkulasi offset zona waktu server..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Tidak dapat membaca dari berkas" -#: ../../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 "Tidak dapat menulis data ke berkas" -#: ../../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 "Tidak dapat menulis data ke berkas: %s" @@ -1824,13 +1824,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 "Batal" @@ -1850,15 +1850,15 @@ "Tidak bisa mengakses '%s', tidak ada media yang dimasukkan atau drive tidak " "siap" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Tidak bisa menambahkan server pada Manajemen Situs" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Tidak bisa memberikan alamat yang diminta" -#: ../../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?" @@ -1880,20 +1880,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 "Tidak dapat mengedit berkas" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Tidak dapat mengedit berkas, tidak terhubung ke server." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Tidak bisa mengedit berkas, path remote tidak diketahui." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1910,11 +1910,11 @@ msgid "Cannot load key file" msgstr "Tidak dapat memuat berkas kunci" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Tidak dapat membuka toolbar dari berkas sumber" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Tidak bisa mengingat kata sandi" @@ -1923,22 +1923,22 @@ msgid "Cannot rename entry" msgstr "Tidak dapat mengganti nama daftar" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Tidak dapat mengganti nama berkas" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Tidak dapat menyimpat kumpulan filter" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Tidak dapat memilih filter" @@ -2005,7 +2005,7 @@ msgid "Changing logfile settings requires restart of FileZilla." msgstr "Mengganti pengaturan berkas log membutuhkan akses ulang FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Masalah enkoding karakter" @@ -2033,7 +2033,7 @@ msgid "Check for updates failed" msgstr "Pemeriksaan update gagal" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2041,7 +2041,7 @@ "Periksa hak akses login Anda. Kata sandi yang dimasukkan dimulai atau " "diakhiri dengan karakter spasi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2049,7 +2049,7 @@ "Periksa hak akses login Anda. Nama pengguna yang dimasukkan dimulai atau " "diakhiri dengan karakter spasi." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Memeriksa alamat IP eksternal yang benar" @@ -2057,12 +2057,12 @@ msgid "Checking for updates..." msgstr "Memeriksa update..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Pemeriksaan checksum cocok pada berkas %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Pemeriksaan checksum tidak cocok pada berkas %s\n" @@ -2077,11 +2077,11 @@ #: ../../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 "Pilih direktori lokal" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Potongan data terhapus secara tidak benar" @@ -2119,7 +2119,7 @@ msgid "Clear quickconnect bar" msgstr "Hapus koneksi cepat" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Klik pada Selesai untuk menyimpan konfigurasi Anda." @@ -2136,8 +2136,8 @@ msgstr "Tutup &semua tab yang lain" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Tutup FileZilla" @@ -2165,13 +2165,13 @@ 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: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 "Perintah gagal" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Perintah tidak didukung" @@ -2179,9 +2179,9 @@ msgid "Command not supported by this protocol" msgstr "Perintah tidak didukung oleh protokol ini" -#: ../../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 "Perintah:" @@ -2189,12 +2189,12 @@ msgid "Comment" msgstr "Komentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Nama umum:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Komunikasi diputus oleh router atau firewall" @@ -2241,7 +2241,7 @@ msgstr "Transfer konkurensi" #: ../../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 "Kondisi bersifat &case sensitive" @@ -2257,24 +2257,24 @@ msgid "Configure port range" msgstr "Konfigurasi batasan port" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Mengkonfigurasi FileZilla dan jaringan Anda" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Konfirmasi penghapusan" -#: ../../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 "Dibutuhkan konfirmasi" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Selamat, konfigurasi Anda bekerja." @@ -2282,6 +2282,11 @@ msgid "Connect bypassing proxy settings" msgstr "Pengaturan koneksi tanpa melalui proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Koneksi gagal: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Hubungkan pada tab aktual" @@ -2294,29 +2299,25 @@ msgid "Connect to specified Site Manager site" msgstr "Hubungkan ke situs Manajemen Situs yang ditentukan" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Terhubung" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Menghubungkan" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Menghubungkan ke %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Menghubungkan ke %s melalui proxy %s" -#: ../../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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Menghubungkan ke %s..." @@ -2325,118 +2326,122 @@ msgid "Connection" msgstr "Koneksi" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Koneksi dibatalkan" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Percobaan koneksi gagal" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Percobaan koneksi gagal dengan \"%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 "Percobaan koneksi diinterupsi oleh pengguna" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Koneksi time out" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Koneksi tertutup" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Koneksi ditutup oleh server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Koneksi terbentuk, menginisialisasi TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Koneksi terbentuk, mengirimkan permintaan HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Koneksi terbentuk, menunggu ucapan selamat datang." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Koneksi terbentuk, menunggu ucapan selamat datang..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Koneksi putus" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Koneksi tidak diijinkan oleh kumpulan aturan" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Koneksi ditolak" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Koneksi ditolak oleh server" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Koneksi diulang oleh jaringan" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Koneksi diulang oleh peer" -#: ../../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] "Koneksi time out setelah %d detik tidak aktif" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Koneksi time out." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Koneksi ke server putus." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Koneksi dengan proxy terbentuk, melakukan handshake..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Koneksi dengan server tertutup secara prematur." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Koneksi dengan server pengujian gagal" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Konversi berkas kunci" #: ../../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 "Salin (%d) dari %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 "Salinan dari %s" @@ -2446,7 +2451,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "Salin URL dari item yang dipilih pada clipboard." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Tidak dapat menerima hubungan: %s" @@ -2456,30 +2461,30 @@ msgid "Could not add connection to Site Manager" msgstr "Tidak bisa menambahkan koneksi pada Manajemen Situs" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Tidak dapat menyelesaikan operasi" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Tidak dapat terhubung ke server" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Tidak dapat terhubung ke server: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Tidak dapat mengkonversi perintah ke enkoding server" -#: ../../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 "Tidak dapat mengkonversi kunci privat" -#: ../../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 "Tidak dapat menyalin URL" @@ -2487,17 +2492,17 @@ msgid "Could not copy data" msgstr "Tidak dapat menyalin data" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Tidak bisa membuat berkas lokal%s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Tidak bisa membuat 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" @@ -2508,11 +2513,11 @@ "Entah ekstensi shell tidak terinstal dengan benar atau Anda tidak meletakkan " "berkas pada jendela Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Tidak dapat menjalin hubungan dengan server" -#: ../../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 " @@ -2524,11 +2529,11 @@ "perintah '--datadir ' atau dengan menentukan variabel lingkungan " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Tidak dapat menghasilkan urutan login." -#: ../../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" @@ -2536,7 +2541,7 @@ "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, " "gnutls_x509_get_issuer_dn gagal" -#: ../../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" @@ -2544,25 +2549,30 @@ "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, " "gnutls_x509_get_dn gagal" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Tidak dapat memperoleh path remote lengkap" -#: ../../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 "Tidak dapat mendapatkan jawaban dari 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 "Tidak bisa mendapatkan direktori sementara untuk mendownload berkas" -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2585,11 +2595,11 @@ msgid "Could not load key file" msgstr "Tidak dapat memuat berkas kunci" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Tidak bisa memuat kunci privat" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2600,7 +2610,7 @@ "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote?" -#: ../../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 " @@ -2610,7 +2620,7 @@ "Tidak dapat mendapatkan direktori lokal untuk direktori remote '%s'.\n" "Penjelajahan tersinkronisasi telah dinonaktifkan." -#: ../../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 " @@ -2622,14 +2632,14 @@ "Penjelajahan tersinkronisasi telah dinonaktifkan." #: ../../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 "Tidak dapat membuka clipboard" -#: ../../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 "Tidak bisa membuka berkas log: %s" @@ -2642,42 +2652,50 @@ msgid "Could not parse server address:" msgstr "Tidak dapat memproses alamat server:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Tidak bisa menulis dari socket data." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Tidak bisa menulis dari socket: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Tidak dapat membaca item server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Tidak dapat mencari hingga ke akhir berkas" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Tidak dapat mengirimkan perintah ke fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Tidak dapat mengulang thread IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Tidak dapat memulai handshake proxy: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Tidak dapat memulai transfer" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2697,7 +2715,7 @@ 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:1850 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2706,9 +2724,9 @@ "Tidak dapat menulis \"%s\", antrian tidak dapat disimpan.\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 "" @@ -2719,28 +2737,28 @@ msgid "Could not write \"%s\":" msgstr "Tidak bisa menulis \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Tidak bisa menulis berkas kunci: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Tidak bisa menulis ke berkas lokal" -#: ../../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 "Tidak bisa menulis ke berkas log: %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 "Tidak bisa menulis ke socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Negara:" @@ -2748,11 +2766,11 @@ msgid "Crea&te new file" msgstr "Membua&t berkas baru" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Membuat direktori lokal yang tidak ada dan &masuk" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Membuat direktori remote yang tidak ada dan &masuk" @@ -2783,45 +2801,45 @@ msgid "Create director&y and enter it" msgstr "Membuat direktor&i dan masuk" -#: ../../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 "Membuat direktori" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Membuat berkas kosong" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Membuat direktori" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Membuat direktori '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kesalahan kritis" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kesalahan kritis:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kesalahan transfer berkas kritis" -#: ../../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 "Kesalahan transfer berkas kritis setelah mentransfer %s pada %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" @@ -2851,7 +2869,7 @@ msgid "Cus&tom" msgstr "Kus&tomisasi" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Sekumpulan filter kustomisasi" @@ -2878,6 +2896,10 @@ msgid "D&elete" msgstr "H&apus" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Perbandingan d&irektori" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "&Nonaktifkan semua" @@ -2891,7 +2913,7 @@ msgstr "A&ksi klik ganda pada direktori:" #: ../../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 "D&uplikat" @@ -2907,8 +2929,8 @@ msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Soket data tertutup terlalu cepat" @@ -3026,19 +3048,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Menghapus %u berkas dari \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Menghapus direktori" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Penghapusan banyak direktori yang tidak berelasi belum didukung" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Menghapus link simbolis" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Desktop" @@ -3060,7 +3074,7 @@ msgid "Dire&ctories" msgstr "Dire&ktori" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Arah" @@ -3068,13 +3082,13 @@ msgid "Directory" msgstr "Direktori" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Perbandingan direktori" @@ -3086,11 +3100,11 @@ 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:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Pendataan direktori dibatalkan oleh pengguna" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Pendataan direktori gagal" @@ -3098,12 +3112,12 @@ msgid "Directory listing filters" msgstr "Filter pendataan direktori" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Pendataan direktori \"%s\" berhasil" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Pendataan direktori berhasil" @@ -3111,14 +3125,14 @@ msgid "Disa&ble all" msgstr "&Nonaktifkan semua" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "remote?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3130,23 +3144,23 @@ msgid "Disconnect from server" msgstr "Putuskan hubungan dari server" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Telah terputus dari server" -#: ../../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 "Telah terputus dari server: %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 "Memutuskan dari server sebelumnya" @@ -3172,8 +3186,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Apakah Anda hendak menutup FileZilla?" @@ -3196,7 +3210,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Apakah Anda hendak menghapus antrian transfer?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Apakah Anda hendak mengirimkan '%s' pada server?" @@ -3205,7 +3219,7 @@ msgid "Do you want to reopen this file?" msgstr "Apakah Anda hendak membuka kembali berkas ini?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentasi" @@ -3227,7 +3241,7 @@ msgid "Download" msgstr "Download" -#: ../../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 "&Batasan download:" @@ -3241,9 +3255,9 @@ msgid "Download limit: none" msgstr "Batasan download: tidak ada" -#: ../../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 "Download hasil pencarian" @@ -3255,7 +3269,7 @@ msgid "Download selected files and directories" msgstr "Download berkas dan direktori yang dipilih" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3268,26 +3282,18 @@ msgid "Downloading" msgstr "Mendownload" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Mendownload %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Menndownload banyak direktori yang tidak berhubungan belum didukung" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Mendownload hasil pencarian" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Mendownload update..." -#: ../../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 "" @@ -3295,9 +3301,9 @@ "yet." msgstr "Drag&drop antar FileZilla yang berbeda belum diimplementasikan." -#: ../../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." @@ -3330,7 +3336,7 @@ msgid "E&xport..." msgstr "E&kspor..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-Mail:" @@ -3349,16 +3355,16 @@ "Edit berkas dengan editor yang telah dikonfigurasi dan upload perubahan pada " "server." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Perubahan direktori belum didukung" -#: ../../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 "Pengeditan gagal" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Mengedit hasil pencarian" @@ -3366,7 +3372,7 @@ msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Masukkan perintah sendiri" @@ -3374,7 +3380,7 @@ msgid "Empty command." msgstr "Perintah kosong." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Daftar direktori kosong" @@ -3420,7 +3426,7 @@ msgid "Encryption details" msgstr "Detail enkripsi" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Akhiri perbandingan dan ganti urutan pengurutan?" @@ -3428,15 +3434,15 @@ msgid "Enter &custom command..." msgstr "Masukkan &perintah sendiri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Masukkan 0 untuk kecepatan tidak terbatas." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Masukkan perintah" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Masukkan perintah sendiri" @@ -3450,11 +3456,11 @@ msgid "Enter filter name" msgstr "Masukkan nama filter" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Masukkan nama untuk kelompok filter" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Masukkan nama baru untuk kelompok filter" @@ -3494,7 +3500,7 @@ "- ftps:// untuk FTP melalui TLS (implisit)\n" "- ftpes:// untuk FTP melalui TLS (eksplisit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3524,7 +3530,7 @@ msgid "Error importing" msgstr "Kesalahan dalam mengimpor" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Kesalahan memuat antrian" @@ -3533,50 +3539,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/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: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:939 msgid "Error loading xml file" msgstr "Kesalahan memuat berkas xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Kesalahan menyimpan antrian" -#: ../../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 "Kesalahan menjalankan program" #: ../../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: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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Kesalahan menulis berkas 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 "Kesalahan:" @@ -3666,24 +3672,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP diatas TLS implisit" -#: ../../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 "Gagal mengganti direktori" -#: ../../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 "Gagal mengganti bahasa" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Gagal menyalin atau memindahkan situs" @@ -3691,110 +3697,114 @@ msgid "Failed to create backup copy of xml file" msgstr "Gagal membuat salinan backup dari berkas xml" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Gagal membuat soket, membatalkan" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "Gagal membuat soket untuk mengirim mode transfer aktif" -#: ../../locales/../src/interface/LocalTreeView.cpp:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Gagal untuk mendapatkan path 'Dokumenku'" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Gagal mengambil path desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Gagal untuk menginisialisasi mesin FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Gagal untuk menginisialisasi TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Gagal untuk menginisialisasi jaringan" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Gagal memuat panel, berkas resource tidak valid?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Gagal memuat kunci privat: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Gagal membuka \"%s\" untuk menambah/menulis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Gagal membuka \"%s\" untuk dibaca" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Gagal membuka \"%s\" untuk ditulis" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Tidak dapat memproses path." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Gagal menerima data" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Gagal mengambil daftar direktori" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../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:3779 +#: ../../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:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Gagal mengambil alamat ip lokal." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../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:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Gagal mengambil alamat IP eksternal." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Gagal mengirimkan perintah." -#: ../../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 "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default" -#: ../../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)." @@ -3802,23 +3812,23 @@ "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default (%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 "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default" -#: ../../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 "Gagal menentukan bahasa ke %s, menggunakan bahasa sistem default" -#: ../../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 "Gagal menentukan bahasa ke %s, gunakan bahasa sistem default (%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 "Gagal menentukan bahasa ke %s, menggunakan bahasa sistem default." @@ -3827,11 +3837,11 @@ msgid "Failed to validate settings" msgstr "Gagal memvalidasi pengaturan" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Gagal memverifikasi sertifikat peer" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Gagal menulis ke berkas %s" @@ -3864,7 +3874,7 @@ msgid "File Types" msgstr "Jenis Berkas" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Deskriptor berkas bukan sebuah socket" @@ -3876,7 +3886,7 @@ msgid "File editing" msgstr "Pengeditan berkas" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Berkas ada" @@ -3893,8 +3903,8 @@ msgstr "Daftar berkas" #: ../../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 "Berkas tidak ditemukan" @@ -3903,39 +3913,39 @@ msgid "File search" msgstr "Pencarian berkas" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Transfer berkas dibatalkan oleh pengguna" -#: ../../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 "" "Transfer berkas dibatalkan oleh pengguna setelah mentransfer %s pada %s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Transfer berkas gagal" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Pengiriman berkas dilewatkan" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Transfer berkas berhasil" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transfer berkas berhasil, tertransfer %s pada %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Transfer berkas sedang dalam proses." @@ -3947,7 +3957,7 @@ msgid "File would transfer with binary data type." msgstr "Berkas akan ditransfer dengan tipe data biner" -#: ../../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" @@ -3961,11 +3971,11 @@ "FileZilla sekarang bisa menguji konfigurasi Anda untuk memastikan semua " "sudah sudah benar." -#: ../../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 sudah terhubung ke sebuah server." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "FileZilla harus dijalankan ulang agar perubahan bahasa berjalan." @@ -3979,7 +3989,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 @@ -3990,13 +4000,13 @@ msgid "Filename &filters..." msgstr "&Filter nama berkas..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "Nama berkas tidak bisa dibuat untuk direktori %s dan nama berkas %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Nama berkas tidak valid" @@ -4025,7 +4035,7 @@ msgstr "Berkas saat ini sedang diedit" #: ../../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" @@ -4035,7 +4045,7 @@ msgid "Filesize format" msgstr "Format ukuran berkas" -#: ../../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" @@ -4073,8 +4083,8 @@ msgid "Filter out items matching none of the following" msgstr "Buang semua item yang tidak cocok dengan berikut" -#: ../../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 "Kumpulan filter sudah ada" @@ -4088,11 +4098,11 @@ msgid "Filter validation failed" msgstr "Validasi filter gagal" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Mencari &berkas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Mencari d&irektori" @@ -4109,7 +4119,7 @@ msgid "Fingerprint:" msgstr "Sidik jari:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Panduan konfigurasi firewall dan router" @@ -4141,7 +4151,7 @@ msgid "Force showing &hidden files" msgstr "Paksa menampilkan berkas &tersembunyi" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Paksa menampilkan berkas tersembunyi" @@ -4156,12 +4166,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Menemukan %s %s baru\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Dokumentasi lebih lanjut" @@ -4169,7 +4179,7 @@ msgid "General" msgstr "Umum" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Kegagalan server SOCKS umum" @@ -4182,12 +4192,12 @@ msgid "Get external IP address from the following URL:" msgstr "Dapatkan alamat IP eksternal dari URL berikut:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Mendapatkan bantuan" -#: ../../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 "Karena nama filter sudah ada, timpa kumpulan filter yang ada?" @@ -4195,22 +4205,22 @@ msgid "Global bookmarks" msgstr "Penanda global" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Kesalahan GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Kesalahan GnuTLS %d pada %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Kesalahan GnuTLS %d pada %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Kesalahan GnuTLS %d: %s" @@ -4240,17 +4250,17 @@ msgstr "Tersembunyi" #: ../../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 "Tinggi" -#: ../../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 "Tertinggi" -#: ../../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 "Port tertinggi yang tersedia harus angka antara 1024 dan 65535." @@ -4265,7 +4275,7 @@ msgid "Homepage:" msgstr "Situs:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Situs tidak bisa diakses" @@ -4281,7 +4291,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Host dimulai dengan '[' tetapi tidak ada kurung penutup." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Host tidak dapat dicapai" @@ -4300,7 +4310,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (contoh: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Alamat IPv6 tidak didukung oleh SOCKS4 proxy" @@ -4348,7 +4358,7 @@ "Jika perubahan pada kunci mesin tidak diharapkan, harap menghubungi " "administrator situs." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4356,7 +4366,7 @@ "Jika masalah ini tetap muncul, beberapa router dan/atau firewall akan " "menghalangi FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4374,7 +4384,7 @@ "menambahkan \".1\" pada akhir nama berkas (kemungkinan menimpa berkas log " "lama) dan berkas baru akan dibuat." -#: ../../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." @@ -4382,7 +4392,7 @@ "Jika symlink mengacu ke direktori, FileZilla bisa menghapus link simbolis " "atau menghapus isi dari direktori yang dituju." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4390,7 +4400,7 @@ "Jika masalah ini tetap muncul, harap hubungi pembuat router atau firewall " "Anda untuk solusinya." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "Jika masalah ini tetap ada, harap hubungi pembuat router Anda." @@ -4426,7 +4436,7 @@ "Jika Anda klik pada pengujian, FileZilla akan terhubung ke probe.filezilla-" "project.org dan melakukan pengujian sederhana." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Jika Anda menutup FileZilla, perubahan Anda akan hilang." @@ -4451,7 +4461,7 @@ "Jika Anda memiliki masalah mendapatkan daftar direktori atau mentransfer " "berkas, coba untuk mengganti mode transfer default." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4486,7 +4496,7 @@ "Jika Anda menggunakan router, pastikan semua port diteruskan pada mesin " "dimana Anda menjalankan FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4546,7 +4556,7 @@ "meminta sebuah port kepada server dan terhubung melalui port tersebut. Tidak " "banyak konfigurasi yang harus dilakukan untuk ini." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4554,7 +4564,7 @@ "Rantai yang tidak lengkap, sertifikat induk bukan sertifikat yang " "ditandatangani certificate authority" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Kata kunci salah" @@ -4566,17 +4576,21 @@ "Informasi tentang versi terbaru dari FileZilla tidak bisa didapatkan. Harap " "mencoba kembali nanti." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Menginisialisasi TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Algoritma tidak aman!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktif" @@ -4584,29 +4598,29 @@ msgid "Interface" msgstr "Antarmuka" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "DIinterupsi oleh sinyal" -#: ../../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 "DIinterupsi oleh pengguna" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Ukuran konten tidak valid" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Respon HTTP tidak valid" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Argumen yang dikirimkan tidak valid" -#: ../../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." @@ -4614,18 +4628,19 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Ukuran potongan berkas tidak valid" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Data yang diterima tidak valid" -#: ../../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 "Tanggal tidak valid" @@ -4665,38 +4680,38 @@ "ftps:// untuk FTP diatas TLS (implisit) dan\n" "ftpes:// untuk FTP diatas TLS (eksplisit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Regular expression pada kondisi pencarian tidak valid." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Kode respon tidak valid" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Kondisi pencarian tidak valid: %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 "Path site tidak valid" @@ -4708,23 +4723,23 @@ msgid "Invalid username given." msgstr "Nama Pengguna tidak valid." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Nilai tidak valid untuk ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Nilai tidak valid" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Negara yuridiksi:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Lokalitas yuridiksi:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Kota atau provinsi yuridiksi:" @@ -4732,7 +4747,7 @@ msgid "Keep directories on top" msgstr "Pertahankan direktori diatas" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4767,11 +4782,11 @@ msgid "Language" msgstr "Bahasa" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Bahasa sudah berubah" -#: ../../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" @@ -4801,7 +4816,7 @@ msgid "Limit:" msgstr "Batas:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Ukuran baris kelebihan" @@ -4809,13 +4824,14 @@ msgid "Linked against" msgstr "Dihubungkan dengan" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Soket ditutup" -#: ../../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 "Daftar:" @@ -4828,11 +4844,11 @@ msgid "Local" msgstr "Lokal:" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Alamat lokal digunakan" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Titik ujung lokal sudah ditutup" @@ -4840,21 +4856,21 @@ msgid "Local file" msgstr "Berkas lokal" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Berkas lokal tidak ada." -#: ../../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 "Berkas lokal adalah %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 "Berkas lokal adalah direktori dan bukan berkas biasa" -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Berkas lokal bukan nama berkas yang valid." @@ -4866,7 +4882,7 @@ msgid "Local site:" msgstr "Situs lokal:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Lokalitas:" @@ -4874,12 +4890,16 @@ msgid "Log file" msgstr "Berkas log" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Login" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Melakukan pencatatan" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4887,7 +4907,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:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4895,7 +4915,7 @@ "Data login berisi karakter non-ASCII dan server mungkin tidak mendukung " "UTF-8. Mencoba charset lokal." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "Urutan login dilakukan, namun belum login. Membatalkan." @@ -4912,17 +4932,17 @@ "Jenis login, hanya bisa digunakan dengan URL FTP. Argumen harus berupa '%s' " "atau '%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 "Rendah" -#: ../../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 "Terendah" -#: ../../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 "Port terendah yang tersedia harus angka antara 1024 dan 65535." @@ -4935,44 +4955,44 @@ msgstr "" "Pastikan berkas dapat diakses dan merupakan dokumen XML yang well-formed." -#: ../../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 "Bagian data rusak: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Header rusak: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Transfer manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Cocokkan semua dari pilihan berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Cocok dengan sembarang pilihan berikut" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Tidak cocok dengan pilihan berikut" @@ -4980,12 +5000,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Jumlah maksimum &transfer secara simultan:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Kegagalan alokasi memori" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Pesan log" @@ -4993,7 +5013,7 @@ msgid "Message log position" msgstr "Posisi pesan log" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Pesan terlalu besar" @@ -5013,15 +5033,15 @@ msgid "Move &up" msgstr "Ke &atas" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Komputerku" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Dokumenku" -#: ../../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" @@ -5042,7 +5062,7 @@ msgstr "Nama sudah ada" #: ../../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 "Nama penanda sudah ada." @@ -5058,7 +5078,7 @@ msgid "Need to enter filter name" msgstr "Harus memasukkan nama filter" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Harus memasukkan nama path remote yang valid" @@ -5066,11 +5086,11 @@ msgid "Need to specify a character encoding" msgstr "Harus menentukan enkoding karakter" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Nama node atau nama server disediakan atau tidak diketahui" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5078,8 +5098,8 @@ "Host jaringan tidak memiliki alamat jaringan pada keluarga alamat yang " "diminta" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Jaringan tidak dapat dicapai" @@ -5095,7 +5115,7 @@ msgid "New &tab" msgstr "&Tab baru" -#: ../../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 "Pe&nanda Baru" @@ -5114,14 +5134,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 "Penanda baru" -#: ../../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 "Direktori baru" @@ -5138,9 +5158,9 @@ msgid "New folder" msgstr "Direktori baru" -#: ../../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 "Situs baru" @@ -5148,11 +5168,11 @@ msgid "Next to the transfer queue" msgstr "Disebelah antrian transfer" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Tidak" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Tidak ada alamat yang terasosiasi dengan nama node" @@ -5160,11 +5180,11 @@ msgid "No category to export selected" msgstr "Tidak ada kategori yang akan diekspor" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Tidak ada perintah yang diberikan, membatalkan." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "" "Tidak ada alamat IP eksternal yang ditentukan, mencoba menggunakan default." @@ -5187,27 +5207,27 @@ msgid "No images available" msgstr "Tidak ada gambar yang tersedia" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../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: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 "Tidak ada nama untuk kelompok filter yang diberikan." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Tidak ada program yang diasosiasikan dengan tipe berkas" -#: ../../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 "" "Tidak ada program yang sudah diasosiasikan untuk mengedit berkas dengan " "ekstensi '%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Tidak ada rute" @@ -5215,11 +5235,11 @@ msgid "No search results" msgstr "Tidak ada hasil pencarian" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Tidak ada situs yang tersedia" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Tidak ada metode SOCKS5 auth yang didukung" @@ -5229,7 +5249,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 "Tidak ada" @@ -5237,18 +5257,18 @@ msgid "None selected yet" msgstr "Tidak ada yang terpilih" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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" @@ -5258,16 +5278,16 @@ msgid "Not all items could be requeued for transfer." msgstr "Tidak semua bisa diantrikan ulang untuk transfer." -#: ../../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 "Tidak terhubung" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Tidak terhubung pada sembarang server" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Tidak terhubung pada sembarang server." @@ -5275,11 +5295,11 @@ msgid "Not connected." msgstr "Tidak terhubung." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Tidak diinisialisasi, perlu memanggil WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "Perhatikan bahwa fitur ini hanya didukung menggunakan protokol FTP." @@ -5321,13 +5341,13 @@ #: ../../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" @@ -5345,7 +5365,7 @@ "Pada halaman berikut, mode transfer yang dipilih akan dikonfigurasi, dan " "juga mode kembali jika diaktifkan." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Satu kali" @@ -5391,8 +5411,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 "Pembukaan berkas gagal" @@ -5415,19 +5435,19 @@ msgid "Operating System:" msgstr "Sistem Operasi:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Operasi sudah berjalan" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Operasi sedang berjalan" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Operasi tidak didukung" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisasi:" @@ -5435,16 +5455,16 @@ msgid "Other SFTP options" msgstr "Opsi SFTP lain" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Kesalahan sistem lainnya" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Lainnya:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Kehabisan memori" @@ -5492,7 +5512,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Timpa jika uku&ran berbeda atau sumber lebih baru" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Jenis build: %s\n" @@ -5517,7 +5537,7 @@ msgid "P&roxy host:" msgstr "Host p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "Perintah PORT diabaikan oleh router atau firewall." @@ -5525,11 +5545,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&sif (disarankan)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parameter bukan URL yang valid" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Mem-parsing %d byte informasi versi.\n" @@ -5549,13 +5569,13 @@ msgid "Passive mode" msgstr "Mode pasif" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "Mode pasif telah ditentukan sebagai mode transfer default." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Kata sandi diperlukan" @@ -5564,13 +5584,13 @@ msgid "Path" msgstr "Path" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Path tidak bisa dibuat untuk direktori %s dan sub direktori %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Path tidak ditemukan:" @@ -5589,8 +5609,8 @@ msgid "Permission" msgstr "Hak akses" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Hak akses ditolak" @@ -5603,7 +5623,7 @@ msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5619,13 +5639,13 @@ "Harap konfigurasi sembarang firewall dan router sehingga FileZilla bisa " "membuat koneksi keluar pada sembarang port." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5662,7 +5682,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Harap masukkan nama baru untuk filter yang disalin." -#: ../../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 "Harap masukkan nama baru untuk kelompok filter \"%s\"" @@ -5692,7 +5712,7 @@ msgid "Please enter a password for this server:" msgstr "Harap masukkan kata sandi untuk server ini:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5709,7 +5729,7 @@ "Harap masukan waktu timeout antara 10 dan 9999 detik atau 0 untuk " "menonaktifkan timeout." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Harap masukkan nama unik untuk kumpulan filter ini" @@ -5717,11 +5737,11 @@ msgid "Please enter a username for this server:" msgstr "Harap masukkan nama pengguna untuk server ini:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Harap masukkan jarak port yang valid" -#: ../../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 "Harap masukkan URL untuk mendapatkan alamat eksternal Anda" @@ -5732,7 +5752,7 @@ msgstr "" "Harap masukkan batas kecepatan upload lebih besar atau sama dengan 0 %s/s" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5740,14 +5760,14 @@ "Harap masukkan perintah FTP.\n" "Menggunakan perintah ftp akan menghapus cache direktori." -#: ../../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 "Please enter the name of the directory which should be created:" msgstr "Masukkan nama direktori yang akan dibuat:" -#: ../../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 "Harap masukkan nama berkas yang akan dibuat:" @@ -5755,12 +5775,12 @@ 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:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Harap masukkan alamat IP eksternal Anda" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5778,7 +5798,7 @@ "Harap ikuti instruksi dengan benar, karena konfigurasi yang salah akan " "mencegah koneksi FTP yang sukses." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5786,11 +5806,11 @@ "Harap pastikan FileZilla diijinkan untuk membuat koneksi keluar dan pastikan " "Anda menuliskan alamat dari alamat resolver dengan benar." -#: ../../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 "Harap pastikan lokal yang diminta sudah terinstall pada sistem Anda." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5814,7 +5834,7 @@ "dianggap digunakan oleh trojan atau malware. Hal ini bisa menimbulkan false " "alarm yang bisa Anda abaikan." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5830,7 +5850,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:585 +#: ../../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 " @@ -5840,7 +5860,7 @@ "atau Anda mengalami masalah dengan server padahal sebelumnya bekerja dengan " "baik." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Harap pilih sebuah aksi:" @@ -5875,7 +5895,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Harap pilih attribut baru untuk berkas yang dipilih" -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5893,8 +5913,8 @@ msgid "Positio&n of the message log:" msgstr "Posisi dari pesa&n log:" -#: ../../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 "Kode pos:" @@ -5906,12 +5926,12 @@ msgid "Preallocation" msgstr "Alokasi awal" -#: ../../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 "Situs Terdefinisi" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Mempertahankan berkas waktu" @@ -5919,7 +5939,7 @@ msgid "Preview:" msgstr "Preview:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "Sertifikat koneksi utama dan koneksi data tidak sesuai." @@ -5936,7 +5956,7 @@ msgid "Prioritize directories (default)" msgstr "Direktori prioritas (default)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Prioritas" @@ -5966,7 +5986,7 @@ msgid "Process &Queue" msgstr "Proses &Antrian" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Memproses tabel berkas overflow" @@ -5976,11 +5996,11 @@ msgid "Processed %s in %s." msgstr "Terproses %s dalam %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protokol tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokol tidak didukung pada jenis socket yang diberikan" @@ -5997,36 +6017,40 @@ msgid "Proxy &user:" msgstr "&Pengguna proxy:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Authentikasi proxy gagal" -#: ../../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 "Handshake proxy gagal: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Balasan proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Request proxy gagal. Jawaban dari proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Request proxy gagal: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy ditentukan tetapi host atau port proxy tidak valid" @@ -6042,7 +6066,7 @@ msgid "Public permissions" msgstr "Hak akses publik" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Antrian sudah diproses sepenuhnya" @@ -6061,11 +6085,11 @@ msgid "Queue: empty" msgstr "Antrian: kosong" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Berkas antrian" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Mengantri:" @@ -6082,7 +6106,7 @@ msgid "R&eset and requeue selected files" msgstr "U&langi dan antri ulang berkas yang terpilih" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Perintah Raw FTP" @@ -6099,7 +6123,7 @@ msgid "Re&name" msgstr "Ganti &nama" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6115,47 +6139,47 @@ msgid "Read-only" msgstr "Hanya-baca" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Yakin batalkan operasi yang sedang berjalan?" -#: ../../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] "Yakin menghapus %d direktori dengan isinya dari server?" -#: ../../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] "Yakin menghapus %d berkas? dari server?" -#: ../../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 "Yakin menghapus %s dan %s dari server?" -#: ../../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 "" "Yakin menghapus semua berkas dan/atau direktori yang dipilih dari server?" -#: ../../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 "" "Yakin menghapus semua berkas dan/atau direktori yang dipilih dari komputer " "Anda?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Alasan" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Reboot sistem sekarang" @@ -6163,37 +6187,37 @@ msgid "Rec&urse into subdirectories" msgstr "Mas&uk jauh kedalam sub direktori" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Menerima peringatan TLS dari server: %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 "" "Menerima sebuah daftar direktori yang tampaknya dikodekan dalam 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 "Menerima baris melebihi 10000 karakter, dibatalkan." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Data yang diterima ditolak" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Menerima karakter tidak valid pada informasi versi" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Informasi versi yang diterima terlalu besar" @@ -6226,13 +6250,13 @@ msgid "Recursively deleting files and directories." msgstr "Menghapus berkas dan direktori secara rekursif." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Pengalihan ke alamat yang tidak valid atau tidak didukung: %s" @@ -6242,7 +6266,7 @@ msgid "Refresh the file and folder lists" msgstr "Perbarui daftar berkas dan direktori" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Ingat kata kunci?" @@ -6250,20 +6274,20 @@ msgid "Remote" msgstr "Remote" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Sertifikat remote tidak dipercaya." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Berkas remote" -#: ../../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 "Pencarian berkas remote" @@ -6299,11 +6323,11 @@ 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:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Path remote tidak bisa diproses." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Penanganan path remote:" @@ -6343,29 +6367,29 @@ msgid "Rename selected files and directories" msgstr "Ganti nama berkas dan direktori yang terpilih" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Mengganti nama '%s' menjadi '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Melaporkan kesalahan dan permintaan fitur" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Permintaan ditolak atau gagal" @@ -6381,28 +6405,28 @@ msgid "Reset and requeue &all" msgstr "Ulangi dan antri ulang &semua berkas" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Protokol yang di-resolve tidak diketahui" -#: ../../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 "Me-resolve alamat dari %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Sumberdaya tidak tersedia" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Respon:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Hasil:" @@ -6421,19 +6445,19 @@ "Melanjutkan berkas ASCII dapat menimbulkan masalah jika server menggunakan " "format akhir baris yang berbeda dengan klien." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Mengambil daftar direktori dari \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Mengambil daftar direktori..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Menerima alamat IP eksternal dari %s" @@ -6450,7 +6474,7 @@ msgid "S&hutdown system" msgstr "&Mematikan sistem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Berhenti" @@ -6470,7 +6494,7 @@ msgid "SOC&KS 4" msgstr "&SOCKS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 proxy akan tersambung ke: %s" @@ -6479,34 +6503,34 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Simpan pengaturan?" -#: ../../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 "" "Penyimpanan kata sandi telah dinonaktifkan oleh administrator sistem Anda." -#: ../../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 "Penyimpanan kata sandi telah dinonaktifkan oleh Anda." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../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:1712 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "Membaca file yang akan di-upload" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Kondisi pencarian:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "&Direktori pencarian:" @@ -6522,8 +6546,8 @@ msgid "Security information" msgstr "Informasi keamanan" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Lihat juga: https://wiki.filezilla-project.org/Network_Configuration" @@ -6574,7 +6598,7 @@ msgstr "Pilih berkas untuk data yang akan diekspor" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Pilih berkas untuk antrian yang akan diekspor" @@ -6583,7 +6607,7 @@ msgstr "Pilih pengaturan untuk berkas yang akan diekspor" #: ../../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 "Pilih berkas untuk situs yang akan diekspor" @@ -6591,23 +6615,23 @@ msgid "Select file to import settings from" msgstr "Pilih pengaturan lokasi berkas yang akan diimpor" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Pilih berkas yang akan di-upload" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Pilih nama berkas untuk berkas kunci yang akan dikonversi" -#: ../../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 "Pilih bagaimana berkas ini harus dibuka" -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Pilih direktori target download" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Pilih nama berkas target" @@ -6619,7 +6643,7 @@ msgid "Select the private data you would like to delete." msgstr "Pilih data privat yang hendak Anda hapus." -#: ../../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." @@ -6631,7 +6655,7 @@ msgid_plural "Selected %d directories." msgstr[0] "Direktori yang dipilih %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." @@ -6649,7 +6673,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Terpilih %s dan %s untuk ditransfer." @@ -6687,7 +6711,7 @@ msgid "Selected file is still being edited" msgstr "Berkas yang dipilih masih diedit" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Filter yang dipilih hanya bekerja untuk berkas lokal." @@ -6712,12 +6736,12 @@ msgid "Send custom command to the server otherwise not available" msgstr "Kirim perintah tertentu ke server jika tidak tersedia" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Mengirimkan perintah keep-alive" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Nomor seri:" @@ -6725,21 +6749,21 @@ msgid "Server &Type:" msgstr "&Jenis Server:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Server tidak memutuskan koneksi TLS dengan benar" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Server tidak mendukung karakter bukan ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6748,15 +6772,15 @@ "Server tidak mendukung proses kelanjutan dari berkas > %d GB. Mengakhiri " "transfer karena ukuran berkas sesuai." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Server tidak mendukung proses kelanjutan dari berkas > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Server tidak mendukung proses kelanjutan dari berkas > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6765,7 +6789,7 @@ "Server mungkin tidak mendukung proses kelanjutan dari berkas > %d GB. " "Mengakhiri transfer karena ukuran berkas sesuai." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6773,11 +6797,11 @@ "Server mungkin membutuhkan akun. Harap tentukan sebuah akun menggunakan " "Manajemen Situs" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Server mengirimkan path kosong." -#: ../../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." @@ -6785,13 +6809,13 @@ "Server mengirimkan prompt login tambahan. Anda harus menggunakan jenis login " "interaktif." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6800,14 +6824,14 @@ "Menggunakan alamat server." #: ../../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: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 "Server mengirimkan balasan yang tidak diharapkan." @@ -6823,7 +6847,7 @@ msgid "Server&type:" msgstr "Jenis &Server:" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Berkas server/lokal" @@ -6840,13 +6864,13 @@ msgid "Set &Priority" msgstr "Tentukan &Prioritas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Menentukan hak akses dari '%s' menjadi '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize dipanggil tanpa soket" @@ -6866,7 +6890,7 @@ msgid "Show &welcome dialog..." msgstr "Tampilkan dialog &selamat datang..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "" "Tampilkan struktur pohon dari dua direktori dan melanjutkan perbandingan?" @@ -6887,7 +6911,7 @@ msgid "Shows this help dialog" msgstr "Tampilkan dialog bantuan ini" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Mematikan sistem sekarang" @@ -6927,23 +6951,23 @@ msgid "Site Manager already open" msgstr "Manajemen Situs telah dibuka" -#: ../../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 "Site tidak ada." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 msgid "Site path has to begin with 0 or 1." msgstr "Path site harus dimulai dengan 0 atau 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 "Path situs sudah diganti." @@ -6962,7 +6986,7 @@ "Situs.\n" "Tambahkan koneksi aktual pada manajemen situs?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Ukuran" @@ -6981,43 +7005,43 @@ msgid "Skip file" msgstr "Lewati berkas" -#: ../../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 "Lewati download %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 "Lewati upload %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Alamat socket diluar ruang alamat" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket sudah terhubung" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Socket telah berhenti" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket tidak terhubung" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Jenis socket tidak didukung pada keluarga alamat" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Beberapa berkas masih diedit atau harus diupload." @@ -7034,7 +7058,7 @@ msgid "Sort directories inline" msgstr "Urutkan direktori secara inline" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Urutan pengurutan tidak bisa diganti jika membandingkan direktori." @@ -7050,7 +7074,7 @@ msgid "Source and path of the drop operation are identical" msgstr "Sumber dan path dari operasi drop sama" -#: ../../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 "Berkas sumber dan target tidak boleh sama" @@ -7062,7 +7086,7 @@ msgid "Source file:" msgstr "Berkas sumber:" -#: ../../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" @@ -7100,19 +7124,19 @@ msgid "Start with opened Site Manager" msgstr "Mulai dengan Manajemen Situs yang terbuka" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Pemeriksaan update dimulai pada %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Mulai mendownload %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Mulai upload %s" @@ -7121,18 +7145,18 @@ msgid "Starts the local site in the given path" msgstr "Menjalankan situs lokal pada path yang diberikan" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Kota atau provinsi:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7144,7 +7168,7 @@ msgid "Stop recursive operation" msgstr "Menghentikan operasi rekursif" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Jalan:" @@ -7160,11 +7184,11 @@ msgid "Summary of test results:" msgstr "Ringkasan dari hasil pengujian:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Menghentikan sekarang" -#: ../../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." @@ -7172,24 +7196,24 @@ "Symlink ke berkas tidak terpengaruh oleh pilihan ini, karena symlink selalu " "dihapus." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Penjelajahan tersinkronisasi" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Penjelajahan tersinkronisasi sudah dinonaktifkan." @@ -7203,8 +7227,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Kesalahan sintaks pada perintah baris" @@ -7216,11 +7240,11 @@ msgid "System details" msgstr "Detail sistem" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Batas sistem untuk berkas yang terbuka sudah terlampaui" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Sub sistem jaringan gagal" @@ -7228,19 +7252,19 @@ msgid "T&oolbar" msgstr "T&oolbar" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Koneksi TLS terbentuk, mengirimkan permintaan HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "Koneksi TLS terjalin, menunggu ucapan selamat datang..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Koneksi TLS terjalin." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TLS kadaluarsa" @@ -7252,15 +7276,15 @@ msgid "Target file:" msgstr "Berkas target:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Nama berkas tujuan telah ada!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Berkas tujuan telah ada, yakin melanjutkan?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Kegagalan sementara dalam resolusi nama" @@ -7268,7 +7292,7 @@ msgid "Test results" msgstr "Hasil pengujian" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Menguji kemampuan melanjutkan dari server" @@ -7294,25 +7318,25 @@ "Manajemen Situs telah dibuka pada FileZilla 3 lainnya.\n" "Harap menutupnya atau data tidak akan bisa dihapus." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Alamat yang Anda masukkan adalah: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Anggota ai_family tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Penanda tidak bisa ditambahkan." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Penanda tidak bisa dibersihkan." @@ -7334,17 +7358,17 @@ "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:139 +#: ../../locales/../src/engine/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: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 "Editor default untuk berkas teks tidak ditemukan." -#: ../../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 "Editor default untuk berkas teks adalah '%s'." @@ -7356,7 +7380,7 @@ msgstr "" "Nama filter yang dimasukkan sudah ada, harap memilih nama yang berbeda." -#: ../../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 "Ektensi '%s' sudah ada ada pada daftar" @@ -7372,7 +7396,7 @@ "Masukkan nama baru:" #: ../../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" @@ -7403,7 +7427,7 @@ msgstr "Berkas '%s' tidak bisa dimuat." #: ../../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" @@ -7413,7 +7437,7 @@ "Tidak ada program yang diasosiasikan pada sistem Anda dengan berkas ini." #: ../../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" @@ -7435,7 +7459,7 @@ "hilangnya data.\n" "Apakah Anda hendak melanjutkan?" -#: ../../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" @@ -7484,7 +7508,7 @@ msgid "The following files are currently being edited:" msgstr "Berkas-berkas berikut ini sedang diedit:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Solusi FTP open source yang gratis" @@ -7505,17 +7529,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Direktori lokal '%s' tidak bisa dibuat." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Direktori lokal '%s' tidak ada." -#: ../../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" @@ -7525,7 +7549,7 @@ "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori " "lokal?" -#: ../../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." @@ -7541,16 +7565,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Antrian tidak akan disimpan." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Direktori remote '%s' tidak ada." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7590,11 +7614,11 @@ "Ini bisa berbahaya dan merusak sistem Anda.\n" "Apakah Anda hendak melanjutkan?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Server tidak bisa ditambahkan." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Server mengirimkan balasan yang tidak diharapkan atau tidak dikenali." @@ -7628,7 +7652,7 @@ "Kunci mesin server tidak diketahui. Anda tidak memiliki jaminan bahwa server " "ini adalah komputer yang Anda harapkan." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "{arameter servname tidak didukung untuk ai_socktype" @@ -7640,19 +7664,19 @@ "Pengaturan sudah berhasil diimpor. Anda harus menjalankan ulang FileZilla " "agar efek pengaturan berjalan." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Jenis alamat tidak didukung" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Nama jaringan yang ditentukan tidak lagi tersedia" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "Sistem akan segera reboot kecuali Anda menekan Batal." -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Sistem akan segera mati kecuali Anda menekan Batal." @@ -7664,7 +7688,7 @@ "Berkas target telah ada.\n" "Harap pilih sebuah aksi." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Pengujian tidak sukses. Apakah Anda hendak menyimpan perubahan?" @@ -7677,15 +7701,15 @@ msgid "Themes" msgstr "Tema" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Kumpulan filter ini tidak bisa dihapus." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Filter ini tidak bisa diganti namanya." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7708,7 +7732,7 @@ "Panduan ini akan membantu mengkonfigurasi router dan firewall yang Anda " "miliki dan menguji konfigurasi Anda." -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Waktu" @@ -7721,25 +7745,25 @@ msgstr "Time&out dalam detik:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Judul:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Untuk melakukannya, struktur pohon direktori harus menampilkan berkas " @@ -7806,17 +7830,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Mengganti tampilan antrian pengiriman" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Baris header terlalu panjang" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Terlalu banyak pengalihan" -#: ../../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 "Jejak:" @@ -7845,17 +7869,17 @@ msgid "Transfer Settings" msgstr "Pengaturan Transfer" -#: ../../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 "Percobaan koneksi diinterupsi: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Data transfer rusak." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Mentransfer" @@ -7864,8 +7888,7 @@ msgid "Transfers" msgstr "Transfer" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Transfer selesai" @@ -7877,11 +7900,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Anggap jenis berkas &berikut sebagai berkas ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Percayai Kunci mesin yang berubah:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Percayai Kunci mesin baru:" @@ -7919,7 +7942,7 @@ msgid "U&pload" msgstr "U&pload" -#: ../../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 "Batasn U&pload:" @@ -7929,20 +7952,20 @@ msgstr "Gunakan asosiasi jenis berkas jika tersedia" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "&Gunakan default sistem" +msgid "U&se system defaults for current language" +msgstr "Gunakan default si&stem untuk bahasa terpilih" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "PENGGUNA@HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Kode kesalahan yang belum ditentukan %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Unit:" @@ -7951,11 +7974,11 @@ msgid "Unknown" msgstr "Tidak diketahui" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versi protokol SOCKS tidak diketahui: %d" @@ -7968,7 +7991,7 @@ msgid "Unknown host key" msgstr "Kunci mesin tidak diketahui" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7984,8 +8007,8 @@ "Elemen root tidak diketahui, berkas tampaknya bukan dihasilkan oleh " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -7993,7 +8016,7 @@ "Kecuali masalah ini diperbaiki, mode aktif FTP tidak akan bekerja dan mode " "pasif harus digunakan." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -8001,11 +8024,11 @@ "Kecuali masalah ini diperbaiki, mode aktif FTP tidak akan bekerja dan mode " "pasif harus digunakan." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Jenis sertifikat tidak didukung" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Pengalihan tidak didukung" @@ -8075,12 +8098,12 @@ msgid "Use &custom editor:" msgstr "Gunakan editor &kustomisasi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Gunakan Penjelajahan t&ersinkronisasi" @@ -8107,8 +8130,8 @@ msgstr "Gunakan server dari manajemen situs" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Gunakan &default sistem" +msgid "Use system &defaults for current language" +msgstr "Gunakan &default sistem untuk bahasa terpilih" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8145,7 +8168,7 @@ msgid "User:" msgstr "Pengguna:" -#: ../../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 "Pengguna tidak bisa merupakan kumpulan spasi" @@ -8169,7 +8192,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Pesan log detail dari wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Memverifikasi sertifikat..." @@ -8177,7 +8200,7 @@ msgid "Very high" msgstr "Sangat tinggi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "Opsi sudah ditentukan, tetapi tidak didukung oleh server" @@ -8193,15 +8216,15 @@ msgid "W&rite" msgstr "T&ulis" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Menunggu" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Menunggu koneksi" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Menunggu kata sandi" @@ -8213,7 +8236,7 @@ msgid "Waiting to retry..." msgstr "Menunggu untuk mencoba kembali..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Peringatan, mengabaikan koneksi data dari IP yang salah." @@ -8236,11 +8259,11 @@ msgid "Warning: Potential security breach!" msgstr "Peringatan: Kemungkinan masalah keamanan!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Selamat datang ke FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Apa yang baru" @@ -8248,7 +8271,7 @@ msgid "What's new:" msgstr "Apa yang baru:" -#: ../../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." @@ -8273,7 +8296,7 @@ msgid "Widescreen" msgstr "Layar lebar" -#: ../../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 "Apakah Anda menghendaki FileZilla untuk mengingat kata sandi ini?" @@ -8281,20 +8304,20 @@ msgid "Wr&ite" msgstr "Tu&lis" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Alamat IP eksternal salah" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Akhir baris salah" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Ya" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8306,7 +8329,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Anda menggunakan versi terbaru dari 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 "Anda selalu bisa membuka dialog ini kemudian melalui menu bantuan." @@ -8345,12 +8368,12 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8358,7 +8381,7 @@ "Anda telah memilih lebih dari 10 berkas untuk pengeditan, apakah Anda hendak " "melanjutkan?" -#: ../../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?" @@ -8366,7 +8389,7 @@ "Anda telah memilih lebih dari 10 berkas atau direktori untuk dibuka, apakah " "Anda hendak melanjutkan?" -#: ../../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 "Anda harus memasukkan nama mesin" @@ -8375,30 +8398,30 @@ msgid "You have to enter a key file path" msgstr "Anda harus memasukkan path berkas kunci" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Anda harus memasukkan direktori lokal." -#: ../../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 "Anda harus memasukkan alamat IP valid." +#: ../../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 "Anda harus memasukkan alamat IPv4 valid." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Anda harus memasukkan direktori lokal yang dapat ditulisi." -#: ../../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 "Anda harus memasukkan nama akun" -#: ../../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 "Anda harus memasukkan nama pengguna" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8452,23 +8475,23 @@ "Anda harus memasukkan path lokal dan remote untuk mengaktifkan penjelajahan " "tersinkronisasi untuk situs ini." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Anda harus menentukan berkas lokal" -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Anda harus menentukan berkas remote" -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Anda harus menentukan path remote" -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Anda harus menentukan sebuah server" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8476,7 +8499,7 @@ "Anda seharusnya tidak memiliki masalah terhubung dengan server lain, " "transfer berkas seharusnya bekerja dengan baik." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Komputer Anda akan segera dihentikan kecuali Anda menekan Batal." @@ -8501,7 +8524,7 @@ msgid "contains" msgstr "berisi" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "kustomisasi" @@ -8523,19 +8546,19 @@ msgid "equals" msgstr "sama" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "berkas" -#: ../../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 " @@ -8545,15 +8568,15 @@ "Harap pastikan program ini ada pada direktori yang sama dengan program utama " "FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp bagian dari versi terbaru dari FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp tidak bisa dijalankan" -#: ../../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 tidak menghasilkan sertifikat" @@ -8609,10 +8632,10 @@ msgid "owner writeable" msgstr "dapat ditulisi pemilik" -#: ../../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: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 "Tidak diketahui" @@ -8633,6 +8656,30 @@ 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 " diff -Nru filezilla-3.14.1/locales/it.po filezilla-3.15.0.2/locales/it.po --- filezilla-3.14.1/locales/it.po 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/locales/it.po 2016-02-05 08:54:46.000000000 +0000 @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: Filezilla italian translation 2015.10.15\n" +"Project-Id-Version: Filezilla italian translation 22.01.2016\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:13+0200\n" -"PO-Revision-Date: 2015-10-15 18:17+0200\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" "Language-Team: bovirus - Andrea Sanavia - Vincenzo Reale - Riccardo Vianello " "\n" @@ -12,7 +12,7 @@ "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.5\n" +"X-Generator: Poedit 1.8.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 @@ -45,9 +45,9 @@ msgstr[0] "%d cartella" msgstr[1] "%d cartelle" -#: ../../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" @@ -56,9 +56,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" @@ -79,12 +79,12 @@ msgstr[0] "%d file. Dimensione totale: almeno %s" msgstr[1] "%d file. Dimensione totale: almeno %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:104 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -156,7 +156,7 @@ msgstr[0] "%s byte" msgstr[1] "%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 " @@ -171,7 +171,7 @@ "Riscaricate FileZilla. Se il problema persiste, inviate una segnalazione per " "questo errore." -#: ../../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 " @@ -203,7 +203,7 @@ msgid "%w - Proxy password" msgstr "%w - Password proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "Interrompi connessione precedente e connetti nella sched&a attuale" @@ -257,7 +257,7 @@ msgid "&Always use default editor" msgstr "&Utilizza sempre l'editor predefinito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "Us&a sempre la selezione per i file non associati" @@ -295,9 +295,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 @@ -310,8 +310,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" @@ -384,14 +384,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 "&Elimina" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Elimina collegamento simbolico" @@ -399,14 +399,14 @@ msgid "&Directory comparison" msgstr "&Comparazione cartelle" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -434,7 +434,7 @@ msgid "&Display size in bytes" msgstr "Visualizza dimensione in b&yte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Non memorizzare le passwor&d (raccomandato)" @@ -455,7 +455,7 @@ msgid "&Download" msgstr "&Scarica" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Download in:" @@ -488,7 +488,7 @@ msgid "&Enable compression" msgstr "Abilita compr&essione" -#: ../../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 "&Abilita Limiti di velocità" @@ -505,7 +505,7 @@ msgid "&Enter custom command..." msgstr "&Esegui comando personalizzato..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Stabilisci conn&essione in una nuova scheda" @@ -558,7 +558,7 @@ msgid "&Finish editing and delete local file" msgstr "&Termina le modifiche ed elimina il file locale" -#: ../../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" @@ -566,7 +566,7 @@ "&Percorso remoto non strutturato, download di tutti i file contenuti " "direttamente nella cartella destinazione" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "" "&Seguire i collegamenti simbolici, eliminare il contenuto della cartella " @@ -631,7 +631,7 @@ msgid "&Install new version" msgstr "&Installa nuova versione" -#: ../../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 "&Mantieni struttura percorso remoto nella radice di ricerca" @@ -656,7 +656,7 @@ msgstr "Struttura cartella &locale" #: ../../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 "Cartella &locale:" @@ -720,7 +720,7 @@ msgid "&New Site" msgstr "&Nuovo sito" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Nuova versione disponibile!" @@ -747,7 +747,7 @@ msgstr "&Valore numerico:" #: ../../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 "&OK" @@ -824,12 +824,12 @@ 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:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "Cartella &remota:" @@ -850,7 +850,7 @@ msgstr "&Rimuovi selezionato" #: ../../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 @@ -911,7 +911,7 @@ msgid "&Save as..." msgstr "&Salva come..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Trova" @@ -980,7 +980,7 @@ msgid "&Speed limits" msgstr "&Limiti di velocità" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Avvia &immediatamente il trasferimento" @@ -992,7 +992,7 @@ msgid "&TLS Ciphers" msgstr "Crittografie &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Test" @@ -1035,7 +1035,7 @@ msgid "&Uploads:" msgstr "&Upload:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Usa programma personalizzato" @@ -1069,7 +1069,7 @@ msgid "&Username:" msgstr "Nome &utente:" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Versione %s" @@ -1114,13 +1114,13 @@ msgid "'%s' is not a directory." msgstr "'%s' non è una cartella." -#: ../../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 "" "L'accesso di tipo 'Account' non è supportato dal protocollo selezionato" -#: ../../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." @@ -1136,7 +1136,7 @@ "I tipi di accesso 'Normale' e 'Account' non sono disponibili. L'elemento è " "stato modificato in 'Richiedi password'." -#: ../../locales/../src/interface/Mainfrm.cpp:587 +#: ../../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 " @@ -1194,8 +1194,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(esempio: %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 @@ -1275,7 +1275,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "" "Non è possibile trascinare una cartella in una delle sue sottocartelle." @@ -1303,7 +1303,7 @@ "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: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 " @@ -1322,7 +1322,7 @@ msgid "A new version of FileZilla is available:" msgstr "È disponibile una versione nuova di FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../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." @@ -1338,7 +1338,7 @@ "Un server standard non richiede questo. Se vi serve questo contattate " "l'amministratore del server." -#: ../../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?" @@ -1391,11 +1391,11 @@ #: ../../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: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" @@ -1421,7 +1421,7 @@ msgid "Active mode" msgstr "Modalità attiva" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1429,7 +1429,7 @@ "Test della modalità attiva non riuscito. Non è stato fornito l'indirizzo IP " "corretto." -#: ../../locales/../src/interface/netconfwizard.cpp:608 +#: ../../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." @@ -1437,7 +1437,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:596 +#: ../../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 " @@ -1450,7 +1450,7 @@ msgid "Active mode IP" msgstr "IP in modalità attiva" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "&Aggiungi solo i file alla coda" @@ -1469,7 +1469,7 @@ msgid "Add to queue" msgstr "Aggiungi alla coda" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Tipo di indirizzo non supportato" @@ -1491,7 +1491,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Esegui sempre questa azione" @@ -1499,7 +1499,7 @@ msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Tutti i file sono stati trasferiti correttamente" @@ -1509,7 +1509,7 @@ "Tutte le porte nell'intervallo specificato devono essere comprese tra 1024 e " "65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1530,7 +1530,7 @@ "Permetti il passaggio ad altra modalità di trasferimento in caso di " "fallimento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Già connesso" @@ -1564,7 +1564,7 @@ "Alternativamente, puoi anche scaricare la versione aggiornata dal sito web " "FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1574,7 +1574,7 @@ "\".\n" "Alcuni elementi della coda potrebebro non essere stati ripristinati." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1584,7 +1584,7 @@ "\".\n" "Alcuni elementi della coda potrebebro non essere stati ripristinati." -#: ../../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." @@ -1593,16 +1593,16 @@ "posizione di destinazione." #: ../../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/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 "Anonimo" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1612,11 +1612,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Qualsiasi modifica ai filtri non verrà salvata." @@ -1640,7 +1640,7 @@ msgid "Archive" msgstr "Archivio" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Buffer argomenti pieno" @@ -1658,7 +1658,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Richiedi password" @@ -1670,7 +1670,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Inserimento richieste nel forum di FileZilla" @@ -1690,7 +1690,7 @@ msgid "Attribute" msgstr "Attributo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Autenticazione non riuscita." @@ -1719,11 +1719,11 @@ msgid "B&ypass proxy" msgstr "I&gnora proxy" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Errato descrittore file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Istruzione per l'uso base" @@ -1736,7 +1736,7 @@ msgid "Being edited" msgstr "Modifiche in corso" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Attenzione! Il certificato è stato revocato" @@ -1754,11 +1754,11 @@ msgid "Bookmark" msgstr "Preferito" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Preferito:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Segnalibri" @@ -1774,7 +1774,7 @@ msgid "Build information" msgstr "Informazioni versione" -#: ../../locales/../src/interface/verifycertdialog.cpp:241 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Categoria business:" @@ -1814,8 +1814,8 @@ msgid "CPU features:" msgstr "Funzioni CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Calcolo scostamento fuso orario del server..." @@ -1824,12 +1824,12 @@ msgstr "Non si riesce a leggere il file" #: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:718 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:718 +#: ../../locales/../src/engine/transfersocket.cpp:720 #, c-format msgid "Can't write data to file: %s" msgstr "Impossibile scrivere nel file: %s" @@ -1847,13 +1847,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 "Annulla" @@ -1873,15 +1873,15 @@ "Non è possibile accedere a '%s', nessun supporto inserito o dispositivo non " "pronto." -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Impossibile aggiungere server al Gestore siti" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Impossibile assegnare indirizzo richiesto" -#: ../../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?" @@ -1903,20 +1903,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 "Non è possibile modificare il file" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Impossibile modificare il file, non connesso a nessun server." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Impossibile modificare il file, percorso remoto sconosciuto." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1933,11 +1933,11 @@ msgid "Cannot load key file" msgstr "Impossibile caricare il file della chiave" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Non è possibile caricare la barra strumenti dal file risorse" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Impossibile memorizzare le password" @@ -1946,22 +1946,22 @@ msgid "Cannot rename entry" msgstr "Non è possibile rinominare la voce" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Non è possibile rinominare il file" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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" -#: ../../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 "Non è possibile salvare un gruppo di filtri" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Impossibile selezionare il filtro" @@ -2028,7 +2028,7 @@ 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:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Problema di codifica del carattere" @@ -2056,7 +2056,7 @@ msgid "Check for updates failed" msgstr "Controllo aggiornamenti non riuscito" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2064,7 +2064,7 @@ "Verifica le credenziali di accesso. La password inserita inizia o finisce " "con uno spazio." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2072,7 +2072,7 @@ "Verifica le credenziali di accesso. Il nome inserito inizia o finisce con " "uno spazio." -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Controllo di correttezza dell'IP esterno" @@ -2080,12 +2080,12 @@ msgid "Checking for updates..." msgstr "Controllo disponibilità aggiornamenti..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Corrispondenza checksum nel file %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Discordanza checksum nel file %s\n" @@ -2100,11 +2100,11 @@ #: ../../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 "Selezionare la cartella locale" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Blocco di dati terminato non appropriatamente" @@ -2142,7 +2142,7 @@ msgid "Clear quickconnect bar" msgstr "Azzera la lista della barra di Connessione rapida" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Fai clic su [Fine] per salvare la configurazione." @@ -2159,8 +2159,8 @@ msgstr "Chiudi &tutte le altre schede" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Chiudi FileZilla" @@ -2188,13 +2188,13 @@ 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: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 "Comando non riuscito" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Comando non supportato" @@ -2202,7 +2202,7 @@ msgid "Command not supported by this protocol" msgstr "Comando non supportato da questo protocollo" -#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/engine/logging.cpp:112 #: ../../locales/../src/interface/StatusView.cpp:283 #: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" @@ -2212,12 +2212,12 @@ msgid "Comment" msgstr "Commento" -#: ../../locales/../src/interface/verifycertdialog.cpp:239 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Nome comune:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Comunicazione corrotta dal router" @@ -2264,7 +2264,7 @@ msgstr "Trasferimenti concorrenti" #: ../../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 "Le condizioni f&anno distinzione tra maiuscole e minuscole" @@ -2280,24 +2280,24 @@ msgid "Configure port range" msgstr "Configura l'intervallo di porte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Configurazione di FileZilla e della rete" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Conferma cancellazione" -#: ../../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 "Richiedi conferma" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Congratulazioni, la configurazione sembra funzionante." @@ -2305,6 +2305,11 @@ msgid "Connect bypassing proxy settings" msgstr "Connetti ignorando le impostazioni proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Connessione fallita: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Connetti nella scheda attuale" @@ -2317,29 +2322,25 @@ msgid "Connect to specified Site Manager site" msgstr "Connetti al sito specificato nel Gestore siti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 -msgid "Connected" -msgstr "Connesso" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Connessione" -#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1050 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Connessione a %s attraverso 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:959 +#: ../../locales/../src/engine/proxy.cpp:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Connessione a %s..." @@ -2348,122 +2349,126 @@ msgid "Connection" msgstr "Connessione" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Connessione interrotta" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Tentativo di connessione non riuscito" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:927 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tentativo di connessione non riuscito con \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../locales/../src/engine/ControlSocket.cpp:185 #: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Tentativo di connessione interrotto dall'utente" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Scaduto tentativo connessione" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Connessione chiusa" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Connessione chiusa dal server" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Connessione stabilita, inizializzazione TLS in corso..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Connessione stabilita, invio richiesta HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Connessione stabilita. In attesa del messaggio di benvenuto." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Connessione stabilita, in attesa del messaggio di benvenuto..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Connessione persa" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Connessione non permessa dalle regole" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Connessione rifiutata" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Connessione rifiutata dal server" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Connessione ripristinata dalla rete" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Connessione ripristinata dal peer" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../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] "Timeout connessione dopo %d secondo di inattività" msgstr[1] "Timeout connessione dopo %d secondi di inattività" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Tempo scaduto per la connessione." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Connessione al server persa." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "" "Connessione con il proxy stabilita, in attesa del messaggio di benvenuto..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "La connessione con il server è stata chiusa prematuramente." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Connessione con il server di test non riuscita." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Converti file della chiave" #: ../../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 "Copia (%d) di %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 "Copia di %s" @@ -2483,30 +2488,30 @@ msgid "Could not add connection to Site Manager" msgstr "Impossibile aggiungere il sito al Gestore siti" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Impossibile completare l'operazione." -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Impossibile collegarsi al server" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Impossibile collegarsi al server: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Impossibile convertire comando alla codifica del server" -#: ../../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 "Impossibile convertire la chiave privata" -#: ../../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 "Impossibile copiare gli URL" @@ -2514,17 +2519,17 @@ msgid "Could not copy data" msgstr "Impossibile copiare i dati" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Impossibile creare il file locale %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Impossibile creare il file accesso 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" @@ -2536,11 +2541,11 @@ "L'estensione della shell non è installata correttamente o non avete " "rilasciato i file su una finestra di Explorer." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Impossibile stabilire una connessione al server" -#: ../../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 " @@ -2553,11 +2558,11 @@ "riga di comando '--datadir ' 0 impostando la variabile " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Impossibile generare sequenza login personalizzata." -#: ../../locales/../src/engine/tlssocket.cpp:934 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2565,7 +2570,7 @@ "Impossibile distinguere nome del certificato emittente, " "gnutls_x509_get_issuer_dn fallito" -#: ../../locales/../src/engine/tlssocket.cpp:911 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2573,27 +2578,32 @@ "Impossibile distinguere nome del certificato oggetto, gnutls_x509_get_dn " "fallito" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Impossibile analizzare il percorso remoto." -#: ../../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 "Impossibile ricevere da fzputtyget." #: ../../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 "Impossibile creare la cartella temporanea per il download del file." -#: ../../locales/../src/engine/tlssocket.cpp:857 +#: ../../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/engine/tlssocket.cpp:852 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2616,11 +2626,11 @@ msgid "Could not load key file" msgstr "Impossibile caricare il file chiave" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Impossibile caricare chiave privata" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2632,7 +2642,7 @@ "Disabilitare la navigazione sincronizzata e continuare le modifiche nella " "cartella remota?" -#: ../../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 " @@ -2643,7 +2653,7 @@ "'%s'.\n" "La navigazione sincronizzata è stata disabilitata." -#: ../../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 " @@ -2655,14 +2665,14 @@ "La navigazione sincronizzata è stata disabilitata." #: ../../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 "Impossibile aprire gli appunti" -#: ../../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 "Impossibile aprire il file log: %s" @@ -2675,7 +2685,11 @@ msgid "Could not parse server address:" msgstr "Impossibile analizzare l'indirizzo del server:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Impossibile leggere dal socket dati." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Impossibile leggere dal socket: %s" @@ -2684,29 +2698,33 @@ msgid "Could not read server item." msgstr "Impossibile leggere l'elemento del server." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +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/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Impossibile trovare la fine del file" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Impossibile inviare comando a fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Impossibile lanciare thread di IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Impossibile avviare handshake proxy: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Impossibile avviare il trasferimento" @@ -2731,7 +2749,7 @@ msgstr "" "Impossibile scrivere \"%s\", i segnalibri globali non saranno salvati: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2742,7 +2760,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:720 #: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, c-format msgid "Could not write \"%s\", the selected sites could not be exported: %s" msgstr "" @@ -2754,28 +2772,28 @@ msgid "Could not write \"%s\":" msgstr "Impossibile scrivere su \"%s\"" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Impossibile scrivere il file della chiave: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Impossibile scrivere nel file locale" -#: ../../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 "Impossibile scrivere nel file log: %s" -#: ../../locales/../src/engine/ControlSocket.cpp:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Impossibile scrivere nel socket: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:244 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Nazione:" @@ -2783,11 +2801,11 @@ msgid "Crea&te new file" msgstr "Crea &un nuovo file" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Crea la cartella locale &mancante e entra nella cartella." -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Crea la cartella re&mota mancante e entra nella cartella." @@ -2818,45 +2836,45 @@ msgid "Create director&y and enter it" msgstr "Crea la &cartella e entra in essa." -#: ../../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 "Nuova cartella" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Crea un file vuoto" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Creazione della cartella in corso" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Creazione cartella '%s' in corso..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Errore grave" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Errore critico:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Errore critico trasferimento file" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../locales/../src/engine/ControlSocket.cpp:120 #, 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:352 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2887,7 +2905,7 @@ msgid "Cus&tom" msgstr "&Personalizza" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Set di filtri personalizzato" @@ -2914,6 +2932,10 @@ msgid "D&elete" msgstr "&Elimina" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Comparazione cartella" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "D&isabilita tutto" @@ -2927,7 +2949,7 @@ msgstr "Azione d&oppio clic sulle cartelle:" #: ../../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 "D&uplica" @@ -2943,8 +2965,8 @@ msgid "Data" msgstr "data" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Data socket chiuso troppo presto." @@ -3065,19 +3087,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Eliminazione di %u file da \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Eliminazione cartelle" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Eliminazione di cartelle multiple non dipendenti non supportato" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Elimina collegamento simbolico" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Desktop" @@ -3099,7 +3113,7 @@ msgid "Dire&ctories" msgstr "&Cartelle" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Direzione" @@ -3107,13 +3121,13 @@ msgid "Directory" msgstr "Cartella" -#: ../../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:2165 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Comparazione cartelle" @@ -3127,11 +3141,11 @@ "La cartella contenente il file di log non esiste o il nome del file non è " "valido." -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Lettura cartella annullata dall'utente" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Lettura cartella non riuscita" @@ -3139,12 +3153,12 @@ msgid "Directory listing filters" msgstr "Filtri di lettura contenuto cartella" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Elenco cartella di \"%s\" completato" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Contenuto cartella letto con successo" @@ -3152,14 +3166,14 @@ msgid "Disa&ble all" msgstr "Disa&bilita tutto" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:649 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3171,23 +3185,23 @@ msgid "Disconnect from server" msgstr "Disconnetti dal server" -#: ../../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: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 "Disconnesso dal server" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../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 "Disconnesso dal server: %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 "Disconnessione dal server precedente" @@ -3213,8 +3227,8 @@ 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:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Chiudere FileZilla?" @@ -3236,7 +3250,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Svuotare la coda di trasferimento?" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Inviare '%s' al server?" @@ -3245,7 +3259,7 @@ msgid "Do you want to reopen this file?" msgstr "Vuoi riaprire questo file?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Documentazione" @@ -3265,7 +3279,7 @@ msgid "Download" msgstr "Download" -#: ../../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 "Limite di &download:" @@ -3279,9 +3293,9 @@ msgid "Download limit: none" msgstr "Limite di download: nessuno" -#: ../../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 "Download risultati ricerca" @@ -3293,7 +3307,7 @@ msgid "Download selected files and directories" msgstr "Scarica file e cartelle selezionate" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3306,26 +3320,18 @@ msgid "Downloading" msgstr "Download in corso" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Download in corso di %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Download di cartelle multiple non dipendenti non supportato" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Download risultati ricerca" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Download aggiornamento..." -#: ../../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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3335,9 +3341,9 @@ "La funzione &Trascina e rilascia tra diverse istanze di FileZilla non è " "stata ancora implementata." -#: ../../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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3372,7 +3378,7 @@ msgid "E&xport..." msgstr "E&sporta..." -#: ../../locales/../src/interface/verifycertdialog.cpp:250 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "Email:" @@ -3390,16 +3396,16 @@ msgstr "" "Modifica il file nell'editor predefinito e carica le modifiche sul server." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "La modifica delle cartelle non è supportata" -#: ../../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 "Modifica non riuscita" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Modifica risultati ricerca" @@ -3407,7 +3413,7 @@ msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Comando vuoto" @@ -3415,7 +3421,7 @@ msgid "Empty command." msgstr "Comando vuoto." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Elenco cartella vuoto" @@ -3423,6 +3429,11 @@ 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." @@ -3461,7 +3472,7 @@ msgid "Encryption details" msgstr "Dettagli di cifratura" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Fine comparazione e cambio ordine visualizzazione?" @@ -3469,15 +3480,15 @@ msgid "Enter &custom command..." msgstr "&Esegui comando personalizzato..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Inserisci 0 per velocità illimitata." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Inserisci comando" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Inserisci comando personalizzato" @@ -3491,11 +3502,11 @@ msgid "Enter filter name" msgstr "Inserisci il nome filtro" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Inserisci il nome per il set di filtri" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Inserisci il nome per il gruppo di filtri" @@ -3536,7 +3547,7 @@ "- ftps:// per FTP su TLS (implicito) e\n" "- ftpes:// per FTP su TLS (esplicito)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3566,7 +3577,7 @@ msgid "Error importing" msgstr "Errore di importazione" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "Errore nel caricamento della coda" @@ -3575,14 +3586,14 @@ #: ../../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/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 @@ -3591,32 +3602,32 @@ #: ../../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:939 msgid "Error loading xml file" msgstr "Errore di caricamento file xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" msgstr "Errore nel salvataggio della coda" -#: ../../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 "Errore nell'avvio del programma" #: ../../locales/../src/interface/bookmarks_dialog.cpp:318 #: ../../locales/../src/interface/bookmarks_dialog.cpp:813 -#: ../../locales/../src/interface/QueueView.cpp:1851 +#: ../../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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Errore di scrittura file xml" -#: ../../locales/../src/engine/logging.cpp:110 +#: ../../locales/../src/engine/logging.cpp:111 #: ../../locales/../src/interface/StatusView.cpp:281 #: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" @@ -3710,24 +3721,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP su TLS implicito" -#: ../../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 "Non è stato possibile cambiare la cartella" -#: ../../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 "Errore durante il cambio di lingua" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Impossibile copiare o spostare siti" @@ -3735,122 +3746,126 @@ 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:803 +#: ../../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/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Non è possibile recuperare il percorso \"Documenti\"" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Non è stato possibile recuperare il percorso del desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:961 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:968 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Non è stato possibile avviare il motore FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Non è stato possibile inizializzare TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Impossibile inizializzare la rete" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 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:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Impossibile caricare chiave privata: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Non è stato possibile aprire \"%s\" in aggiunta/scrittura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Non è stato possibile aprire \"%s\" in lettura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Non è stato possibile aprire \"%s\" in scrittura" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Impossibile analizzare il percorso ritornato." -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Non è stato possibile ricevere i dati" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Non è stato possibile leggere il contenuto della cartella" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../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:3785 +#: ../../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:3806 +#: ../../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:707 +#: ../../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:632 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Non è stato possibile leggere l'indirizzo IP esterno." -#: ../../locales/../src/interface/netconfwizard.cpp:323 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Non è stato possibile inviare il comando." -#: ../../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 "" "Non è stato possibile impostare la lingua %s (%s), sarà utilizzata la lingua " "predefinita" -#: ../../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)." @@ -3858,14 +3873,14 @@ "Non è stato possibile impostare la lingua su %s (%s), sarà utilizzata la " "lingua di sistema predefinita %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 "" "Non è stato possibile impostare la lingua su %s (%s), sarà utilizzata la " "lingua di sistema predefinita." -#: ../../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" @@ -3873,14 +3888,14 @@ "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua " "predefinita" -#: ../../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 "" "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua " "predefinita %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 "" @@ -3891,11 +3906,11 @@ msgid "Failed to validate settings" msgstr "Verifica delle impostazioni non riuscita" -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Impossibile verificare il certificato connessione" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Impossibile scrivere sul file %s" @@ -3928,7 +3943,7 @@ msgid "File Types" msgstr "Tipi di file" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Il descrittore file non è un socket" @@ -3940,7 +3955,7 @@ msgid "File editing" msgstr "Modifica file" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Il file esiste" @@ -3957,8 +3972,8 @@ msgstr "Elenchi file" #: ../../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 "File non trovato" @@ -3967,39 +3982,39 @@ msgid "File search" msgstr "Ricerca file" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Trasferimento interrotto dall'utente" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, 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:136 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Trasferimento fallito" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:131 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Trasferimenti ignorato" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Trasferimento file completato con successo" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Trasferimento file completato; trasferiti %s in %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Trasferimento file ancora in corso." @@ -4011,7 +4026,7 @@ msgid "File would transfer with binary data type." msgstr "Il file dovrebbe essere trasferito in modo binario." -#: ../../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" @@ -4025,11 +4040,11 @@ "FileZilla può testare le impostazioni per assicurare che tutto sia " "configurato in modo corretto." -#: ../../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 è già connesso a un server." -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -4044,7 +4059,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 @@ -4055,13 +4070,13 @@ msgid "Filename &filters..." msgstr "&Filtri nome file..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../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 "Il nome file non può essere costruito per la cartella %s e il file %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Nome file non valido" @@ -4090,7 +4105,7 @@ msgstr "File in corso di modifica" #: ../../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" @@ -4100,7 +4115,7 @@ msgid "Filesize format" msgstr "Dimensione file" -#: ../../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" @@ -4138,8 +4153,8 @@ msgid "Filter out items matching none of the following" msgstr "Nascondi elementi non corrispondenti alle seguenti" -#: ../../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 "Un set di filtri con questo nome è già presente" @@ -4153,11 +4168,11 @@ msgid "Filter validation failed" msgstr "Validazione filtri non riuscita" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Trova &file" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Trova &cartelle" @@ -4174,7 +4189,7 @@ msgid "Fingerprint:" msgstr "Impronta:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Configurazione guidata firewall e router" @@ -4208,7 +4223,7 @@ msgid "Force showing &hidden files" msgstr "Visualizza file &nascosti" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Visualizza file nascosti" @@ -4222,12 +4237,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Trovato nuovo %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Altra documentazione" @@ -4235,7 +4250,7 @@ msgid "General" msgstr "Generale" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Errore generico server SOCKS" @@ -4248,12 +4263,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Ottieni aiuto" -#: ../../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 "Un set di filtri con questo nome è già presente, sovrascrivere?" @@ -4261,22 +4276,22 @@ msgid "Global bookmarks" msgstr "Segnalibri globali" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Errore GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:190 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Errore GnuTLS %d in %s" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Errore GnuTLS %d in %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Errore GnuTLS %d: %s" @@ -4306,17 +4321,17 @@ msgstr "Nascosto" #: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Alto" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "Superiore" -#: ../../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 "" "La massima porta disponibile deve essere un numero compreso tra 1024 e 65535." @@ -4332,7 +4347,7 @@ msgid "Homepage:" msgstr "Sito web:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Host non attivo" @@ -4349,7 +4364,7 @@ msgstr "" "Il nome computer inizia con \"[\" ma non c'è la parentesi quadra di chiusura." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Host non raggiungibile" @@ -4368,7 +4383,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (esempio: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Gli indirizzi IPv6 non sono supportati con il proxy SOCKS4" @@ -4417,13 +4432,13 @@ "Se il cambiamento della chiave dell'host non era previsto, contattare " "l'amministratore del server." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:563 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:579 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4440,7 +4455,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: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." @@ -4448,7 +4463,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:640 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4456,7 +4471,7 @@ "Se il problema persiste, contattare il produttore del vostro router o " "firewall per una soluzione." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "Se il problema persiste, contattare il produttore del vostro router." @@ -4491,7 +4506,7 @@ "Facendo clic su [Test], FileZilla si connetterà a probe.filezilla-project." "org ed effettuerà alcuni semplici test." -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Se FileZilla verrà chiuso, i cambiamenti andranno persi." @@ -4516,7 +4531,7 @@ "trasferimento di file, provare a modificare la modalità di trasferimento " "predefinita." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -4552,7 +4567,7 @@ "Se si utilizza un router, assicurarsi che queste porte siano inoltrate alla " "macchina su cui gira FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4613,7 +4628,7 @@ "FileZilla chiede una porta al server e si connette alla porta indicata. Non " "sono richieste altre configurazioni speciali." -#: ../../locales/../src/engine/tlssocket.cpp:1095 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4621,7 +4636,7 @@ "Segmento incompleto, il certificato principale non è un certificato auto " "firmato da una autorità di certificazione" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Password non corretta" @@ -4633,21 +4648,21 @@ "Informazioni sulla versione aggiornata di Filezilla non disponibili. Riprova " "più tardi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Inizializzazione TLS in corso..." -#: ../../locales/../src/interface/verifycertdialog.cpp:107 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 msgid "Insecure algorithm!" msgstr "Algoritmo non sicuro!" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interattivo" @@ -4655,29 +4670,29 @@ msgid "Interface" msgstr "Interfaccia" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Interrotto dal segnale" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:328 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Interrotto dall'utente" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Lunghezza contenuti non valida" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Risposta HTTP non valida" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Argomento passato non valido" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../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." @@ -4685,13 +4700,14 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Dimensione blocco non valido" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../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 "Ricevuti dati non validi" @@ -4738,22 +4754,22 @@ "ftps:// per FTP su TLS (implicito) e\n" "ftpes:// per FTP su TLS (esplicito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Espressione non valida nelle condizioni di ricerca." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Codice di risposta non valido" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Condizioni non valide di ricerca: %s" @@ -4781,23 +4797,23 @@ msgid "Invalid username given." msgstr "Nome utente fornito non valido." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Valore non valido per ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Valore non valido per i suggerimenti" -#: ../../locales/../src/interface/verifycertdialog.cpp:252 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Nazione giurisdizione:" -#: ../../locales/../src/interface/verifycertdialog.cpp:254 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Località giurisdizione:" -#: ../../locales/../src/interface/verifycertdialog.cpp:253 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Provincia giurisdizione:" @@ -4805,7 +4821,7 @@ msgid "Keep directories on top" msgstr "Mantieni le cartelle in cima" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../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 " @@ -4840,11 +4856,11 @@ msgid "Language" msgstr "Lingua" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Lingua modificata" -#: ../../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" @@ -4874,7 +4890,7 @@ msgid "Limit:" msgstr "Limite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Lunghezza riga in eccesso" @@ -4882,11 +4898,12 @@ msgid "Linked against" msgstr "Collegato contro" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Socket di ascolto chiuso" -#: ../../locales/../src/engine/logging.cpp:117 +#: ../../locales/../src/engine/logging.cpp:118 #: ../../locales/../src/interface/StatusView.cpp:292 #: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" @@ -4901,11 +4918,11 @@ msgid "Local" msgstr "Locale" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Indirizzo locale in uso" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Il punto di chiusura locale è stato chiuso" @@ -4913,21 +4930,21 @@ msgid "Local file" msgstr "File locale" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Il file locale non esiste." -#: ../../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 "Il file locale è %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 "Il file locale è una cartella invece di essere un file normale." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Il file locale non ha un nome file valido." @@ -4939,7 +4956,7 @@ msgid "Local site:" msgstr "Sito locale:" -#: ../../locales/../src/interface/verifycertdialog.cpp:246 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Località:" @@ -4947,12 +4964,16 @@ msgid "Log file" msgstr "File log" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Accesso effettuato" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Connessione" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../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." @@ -4961,7 +4982,7 @@ "essere compatibile UTF-8. Impossibile fallback con set caratteri locale " "usando il proxy." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4969,7 +4990,7 @@ "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:837 +#: ../../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. " @@ -4988,17 +5009,17 @@ "Logontype può essere usato insieme ad una URL FTP. L'argomento deve essere o " "'%s' o '%s'" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Basso" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "Minimo" -#: ../../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 "" "La minima porta disponibile deve essere un numero compreso tra 1024 e 65535." @@ -5011,46 +5032,46 @@ 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: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 "Blocco dati non corretto: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Intestazione non corretta: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Trasferimento manuale" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Accetta tutti i seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Corrispondenza trovata per tutti i seguenti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Nessuna corrispondenza trovata per i seguenti" @@ -5058,12 +5079,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "&Trasferimenti massimi simultanei:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Fallita allocazione memoria" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1750 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Registro messaggi" @@ -5071,7 +5092,7 @@ msgid "Message log position" msgstr "Posizione registro messaggi" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Messaggio troppo lungo" @@ -5091,11 +5112,11 @@ msgid "Move &up" msgstr "Sposta &su" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Risorse del computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Documenti" @@ -5136,7 +5157,7 @@ msgid "Need to enter filter name" msgstr "Devi inserire il nome file" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "È necessario inserire un percorso remoto valido" @@ -5144,11 +5165,11 @@ msgid "Need to specify a character encoding" msgstr "Deve essere specificata la codifica del caratteri" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Nome nodo e nome server non forniti, o sconosiuti" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5156,8 +5177,8 @@ "L'host di rete non ha un indirizzo di rete nella famiglia di indirizzi " "richiesta" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Rete non raggiungibile" @@ -5173,7 +5194,7 @@ msgid "New &tab" msgstr "Nuova &scheda" -#: ../../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 "Nuovo &preferito" @@ -5193,13 +5214,13 @@ #: ../../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/sitemanager_dialog.cpp:2183 msgid "New bookmark" msgstr "Nuovo preferito" -#: ../../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 "Nuova cartella" @@ -5218,7 +5239,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:585 #: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Nuovo sito" @@ -5226,11 +5247,11 @@ msgid "Next to the transfer queue" msgstr "Prossimo nella coda trasferimento" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "No" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Nessun indirizzo associato con il nome nodo" @@ -5238,11 +5259,11 @@ msgid "No category to export selected" msgstr "Nessuna categoria da esportare selezionata" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Nessun comando ottenuto, annullamento in corso." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Nessun IP esterno impostato, sarà provato quello predefinito." @@ -5264,27 +5285,27 @@ msgid "No images available" msgstr "Nessuna immagine disponibile" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "Nessun file nella coda!" -#: ../../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 "Nessun nome è stato fornito per il gruppo di filtri." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Nessun programma associato con il tipo di file" -#: ../../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 "" "Nessun programma è stato associato per la modifica di file con estensione " "'%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Nessun route verso l'host" @@ -5296,7 +5317,7 @@ msgid "No sites available" msgstr "Nessun sito disponibile" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Metodo autenticazione SOCKS5 non supportato" @@ -5314,18 +5335,18 @@ msgid "None selected yet" msgstr "Nessun elemento selezionato" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Normale" @@ -5335,16 +5356,16 @@ 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:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Non connesso" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Nessun server collegato" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Nessun server collegato." @@ -5352,11 +5373,11 @@ msgid "Not connected." msgstr "Non connesso." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Non inizializzato, serve una chiamata a WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Attenzione che questa caratteristica è supportata solo utilizzando il " @@ -5401,13 +5422,13 @@ #: ../../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" @@ -5425,7 +5446,7 @@ "Nelle pagine seguenti, sarà configurata la modalità di trasferimento " "selezionata, così come la modalità di fallback, se abilitata." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Una volta" @@ -5471,8 +5492,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 "Apertura non riuscita" @@ -5495,19 +5516,19 @@ msgid "Operating System:" msgstr "Sistema operativo:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Operazione già in corso" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Operazione in corso" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Operazione non supportata" -#: ../../locales/../src/interface/verifycertdialog.cpp:240 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organizzazione:" @@ -5515,16 +5536,16 @@ msgid "Other SFTP options" msgstr "Altre opzioni SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Altre errore di sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:262 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Altro:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Memoria esaurita" @@ -5573,7 +5594,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Sovrascrivi se dimensione dif&ferente o sorgente più recente" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Tipo build proprietario: %s\n" @@ -5600,7 +5621,7 @@ msgid "P&roxy host:" msgstr "Host p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "Comando PORT corrotto dal router." @@ -5608,11 +5629,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssiva (consigliata)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Il parametro non è una URL valida" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Analisi %d byte informazione versione.\n" @@ -5632,15 +5653,15 @@ msgid "Passive mode" msgstr "Modalità passiva" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../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 "" "La modalità passiva è stata impostata come modalità di trasferimento " "predefinita." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "È richiesta la password" @@ -5649,14 +5670,14 @@ msgid "Path" msgstr "Percorso" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../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 "" "Il percorso non può essere costruito per la cartella %s e la sottocartella %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Percorso non trovato" @@ -5675,8 +5696,8 @@ msgid "Permission" msgstr "Permesso" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Permesso negato" @@ -5689,7 +5710,7 @@ msgid "Platform:" msgstr "Piattaforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../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." @@ -5705,11 +5726,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:578 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5745,7 +5766,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Inserisci un nuovo nome per il filtro copiato." -#: ../../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 "Inserisci un nuovo nome per il gruppo di filtri \"%s\"" @@ -5776,7 +5797,7 @@ msgid "Please enter a password for this server:" msgstr "Inserisci una password per questo server:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5792,7 +5813,7 @@ msgstr "" "Inserisci un timeout tra 10 e 9999 secondi o 0 per disabilitare i timeout." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Inserisci un nome univoco per questo set di filtri" @@ -5800,11 +5821,11 @@ msgid "Please enter a username for this server:" msgstr "Inserisci un nome utente per questo server:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Inserisci un intervallo di porte valido." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "Inserisci l'URL da cui ricavare l'indirizzo IP esterno" @@ -5815,7 +5836,7 @@ msgstr "" "Inserisci un limite di velocità per l'upload superiore o pari a 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5823,14 +5844,14 @@ "Inserisci un comando FTP.\n" "L'utilizzo di comandi ftp personalizzati svuoterà la cache delle cartelle." -#: ../../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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Insersci il nome del file che deve essere creato:" @@ -5838,12 +5859,12 @@ msgid "Please enter username and password for this server:" msgstr "Inserisci nome utente e password per questo server:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Inserisci l'indirizzo IP esterno" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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 " @@ -5861,7 +5882,7 @@ "Seguire attentamente le istruzioni, in quanto una configurazione errata può " "impedire il successo delle connessioni FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../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." @@ -5869,12 +5890,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:136 +#: ../../locales/../src/interface/FileZilla.cpp:157 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:610 +#: ../../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 " @@ -5898,7 +5919,7 @@ "usata da virus o altro malware. Eventuali falsi allarmi di questo tipo " "possono essere ignorati senza problemi." -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../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." @@ -5914,7 +5935,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:586 +#: ../../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 " @@ -5924,7 +5945,7 @@ "variazioni della configurazione di rete o al verificarsi di problemi su " "server precedentemente funzionanti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Selezionare un'azione:" @@ -5959,7 +5980,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:597 +#: ../../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. " @@ -5978,8 +5999,8 @@ msgid "Positio&n of the message log:" msgstr "Posizio&ne del registro messaggi:" -#: ../../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 "CAP:" @@ -5992,11 +6013,11 @@ msgstr "Preallocazione" #: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Siti Predefiniti" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Preserva data e ora file" @@ -6004,7 +6025,7 @@ msgid "Preview:" msgstr "Anteprima:" -#: ../../locales/../src/engine/tlssocket.cpp:1112 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "" "I certificati della connessione primaria e della connessione dati non " @@ -6022,7 +6043,7 @@ msgid "Prioritize directories (default)" msgstr "Cartelle prioritizzate (predefinito)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Priorità" @@ -6052,7 +6073,7 @@ msgid "Process &Queue" msgstr "Elabora co&da" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Tabella file elaborazione piena" @@ -6062,11 +6083,11 @@ msgid "Processed %s in %s." msgstr "Elaborato %s iin %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protocollo non supportato" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protocollo non supportato dal socket fornito" @@ -6083,7 +6104,7 @@ msgid "Proxy &user:" msgstr "&Utente proxy:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Autenticazione proxy non riuscita" @@ -6093,30 +6114,34 @@ msgid "Proxy handshake failed: %s" msgstr "Handshake proxy non riuscito: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Risposta proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Richiesta proxy fallita. Risposta dal proxy: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Richiesta proxy non riuscita: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4241 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy impostato ma proxy o porta proxy non validi" @@ -6132,7 +6157,7 @@ msgid "Public permissions" msgstr "Permessi pubblici" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Coda elaborata completamente" @@ -6151,11 +6176,11 @@ msgid "Queue: empty" msgstr "Coda: vuota" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "File in coda" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "In coda:" @@ -6172,7 +6197,7 @@ msgid "R&eset and requeue selected files" msgstr "Ripristina e m&etti in coda i file selezionati" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Comando FTP" @@ -6189,7 +6214,7 @@ msgid "Re&name" msgstr "Ri&nomina" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6205,12 +6230,12 @@ msgid "Read-only" msgstr "Sola lettura" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Annullare l'operazione attiva?" -#: ../../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 "" @@ -6218,33 +6243,33 @@ 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: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] "Eliminare %d file nel server?" msgstr[1] "Eliminare %d file nel server?" -#: ../../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 "Eliminare %s e %s nel server?" -#: ../../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 "Eliminare tutti i file e/o cartelle selezionati nel server?" -#: ../../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 "Eliminare tutti i file e/o cartelle selezionati nel computer?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Motivo" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Riavvia adesso" @@ -6252,36 +6277,36 @@ msgid "Rec&urse into subdirectories" msgstr "&Includi sottocartelle" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Ricevuto avviso TLS dal server: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2958 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Ricevuta una linea eccedente i 10000 caratteri, interruzione." -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Ricevuti dati corrotti" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Ricevuti caratteri non validi nell'informazione versione" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Ricevuto avviso TLS sconosciuto %d dal server" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "L'informazione versione ricevuta è troppo grande" @@ -6315,13 +6340,13 @@ msgid "Recursively deleting files and directories." msgstr "Eliminazione ricorsiva di file e cartelle." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Redirezione ad un indirizzo non valido o non supportato: %s" @@ -6331,7 +6356,7 @@ msgid "Refresh the file and folder lists" msgstr "Aggiorna l'elenco file e cartelle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Memorizzare la password?" @@ -6339,20 +6364,20 @@ msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:830 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Certificato remoto non sicuro." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "File remoto" -#: ../../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 "Ricerca file remota" @@ -6391,11 +6416,11 @@ "Il percorso remoto non può essere analizzato. Assicurarsi che sia un " "percorso assoluto valido." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Il percorso remoto non ha potuto essere analizzato." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Gestione percorso remoto:" @@ -6435,30 +6460,30 @@ msgid "Rename selected files and directories" msgstr "Rinomina i file e cartelle selezionate" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Rinomina da '%s' a '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Segnalazione bug e richieste di nuove funzionalità" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Richiesta rifiutata o fallita" @@ -6474,28 +6499,28 @@ msgid "Reset and requeue &all" msgstr "Ripristina e rimetti in cod&a tutti i file" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Il protocollo risoluzione è sconosciuto" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../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 "Risoluzione dell'indirizzo IP %s in corso" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Risorsa temporaneamente non disponibile" -#: ../../locales/../src/engine/logging.cpp:112 +#: ../../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 "Risposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Risultati:" @@ -6514,19 +6539,19 @@ "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:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Recupero elenco cartella di \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Lettura elenco cartelle..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "È in corso la lettura dell'indirizzo IP esterno da %s" @@ -6543,7 +6568,7 @@ msgid "S&hutdown system" msgstr "&Arresta il sistema" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Ferma" @@ -6563,7 +6588,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Il proxy SOCKS4 si collegherà a: %s" @@ -6572,17 +6597,17 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Salvare le impostazioni?" -#: ../../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 "" "Il salvataggio password è stato disabilitato dall'amministratore del sistema." -#: ../../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 "Il salvataggio password è stato disabilitato dall'utente." @@ -6595,11 +6620,11 @@ msgid "Scanning for files to upload" msgstr "Ricerca dei file da inviare in corso" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Cerca &condizioni:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Cerca &cartella:" @@ -6615,8 +6640,8 @@ msgid "Security information" msgstr "Informazioni sicurezza" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Vedi anche: https://wiki.filezilla-project.org/Network_Configuration" @@ -6667,7 +6692,7 @@ msgstr "Selezionare il file per l'esportazione dei dati" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Selezionare il file per l'esportazione delle code" @@ -6676,7 +6701,7 @@ msgstr "Selezionare il file per l'esportazione delle impostazioni" #: ../../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 "Selezionare il file per l'esportazione dei siti" @@ -6684,23 +6709,23 @@ msgid "Select file to import settings from" msgstr "Selezionare il file dal quale importare le impostazioni" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Seleziona il file da inviare" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Seleziona il nome per il file convertito della chiave" -#: ../../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 "Seleziona come questi file devono essere aperti." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Seleziona cartella per il download" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Selezionare il nome file destinazione" @@ -6712,7 +6737,7 @@ msgid "Select the private data you would like to delete." msgstr "Selezionare gli elementi privati da eliminare." -#: ../../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." @@ -6726,7 +6751,7 @@ msgstr[0] "Selezionata %d cartella." msgstr[1] "Selezionate %d cartelle." -#: ../../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." @@ -6747,7 +6772,7 @@ msgstr[0] "Selezionato %d file. Dimensione totale: almeno %s" msgstr[1] "Selezionati %d file. Dimensione totale: almeno %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Selezionati %s e %s per il trasferimento." @@ -6785,7 +6810,7 @@ msgid "Selected file is still being edited" msgstr "Si sta ancora modificando il file selezionato" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Il filtro selezionato opera solo su file locali." @@ -6811,12 +6836,12 @@ 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:4317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:251 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Numero seriale:" @@ -6824,21 +6849,21 @@ msgid "Server &Type:" msgstr "&Tipo di server:" -#: ../../locales/../src/engine/tlssocket.cpp:719 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Il server non ha correttamente chiuso la connessione TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Il server non supporta caratteri non ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6847,15 +6872,15 @@ "Il server non supporta il ripristino di file > %d GB. Il trasferimento sarà " "terminato in quanto le dimensioni corrispondono." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Il server non supporta il ripristino di file > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Il server non supporta il ripristino di file > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6864,7 +6889,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:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6872,11 +6897,11 @@ "Il server richiede un account. Specificare un account utilizzando il Gestore " "siti" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Il server ha ritornato un percorso vuoto." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6884,13 +6909,13 @@ "Il server ha inviato una richiesta addizionale di login. È necessario usare " "un tipo di login interattivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6898,15 +6923,15 @@ "Il server ha inviato una risposta passiva contenente un indirizzo non " "raggiungibile. Sarà usato l'indirizzo del server." -#: ../../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: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:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:519 +#: ../../locales/../src/interface/netconfwizard.cpp:530 msgid "Server sent unexpected reply." msgstr "Il server ha inviato una risposta non prevista." @@ -6922,7 +6947,7 @@ msgid "Server&type:" msgstr "&Tipo di server:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "File server/locale" @@ -6939,13 +6964,13 @@ msgid "Set &Priority" msgstr "Imposta &priorità" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Imposta permessi di '%s' a '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:791 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "Chiamata SetSocketBufferSize senza socket" @@ -6965,7 +6990,7 @@ msgid "Show &welcome dialog..." msgstr "Visualizza finestra di &benvenuto..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "" "Visualizzare entrambi gli alberi delle cartelle e continuare la comparazione?" @@ -6986,7 +7011,7 @@ msgid "Shows this help dialog" msgstr "Visualizza questa finestra di aiuto" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Arresta il sistema" @@ -7061,7 +7086,7 @@ "Gestore siti.\n" "Aggiungere la connessione corrente al gestore siti?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Dimensione" @@ -7080,43 +7105,43 @@ msgid "Skip file" msgstr "Ignora file" -#: ../../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: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 "Salta il download di %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/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 "Salta l'invio di %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Indirizzo socket al di fuori dello spazio indirizzi" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Socket già connesso" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Il socket è stato spento" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Socket non connesso" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Tipo socket non supportato per famiglia indirizzi" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 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 " @@ -7135,7 +7160,7 @@ msgid "Sort directories inline" msgstr "Ordina le cartelle" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "L'ordine di visualizzazione non può essere modificato se si stanno " @@ -7153,7 +7178,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Sorgente e destinazione non possono essere lo stesso" @@ -7165,7 +7190,7 @@ msgid "Source file:" msgstr "File sorgente:" -#: ../../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" @@ -7203,19 +7228,19 @@ msgid "Start with opened Site Manager" msgstr "Avvia aprendo Gestore siti" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Controllo aggiornamenti su %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Avvio download di %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Avvio upload di %s" @@ -7224,16 +7249,16 @@ msgid "Starts the local site in the given path" msgstr "Avvia il sito locale nel percorso indicato" -#: ../../locales/../src/interface/verifycertdialog.cpp:245 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Provincia:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Stato" -#: ../../locales/../src/engine/logging.cpp:109 +#: ../../locales/../src/engine/logging.cpp:110 #: ../../locales/../src/interface/StatusView.cpp:295 #: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" @@ -7247,7 +7272,7 @@ msgid "Stop recursive operation" msgstr "Ferma operazioni ricorsive" -#: ../../locales/../src/interface/verifycertdialog.cpp:249 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Via:" @@ -7263,11 +7288,11 @@ msgid "Summary of test results:" msgstr "Riepilogo dei risultati del test:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Sospendi ora" -#: ../../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." @@ -7275,24 +7300,24 @@ "I collegamenti simbolici non sono affetti dalla selezione, così i " "collegamenti simbolici saranno eliminati." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Navigazione sincronizzata" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "La navigazione sincronizzata è stata disabilitata." @@ -7306,8 +7331,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Errore di sintassi nella linea di comando" @@ -7319,11 +7344,11 @@ msgid "System details" msgstr "Dettagli sistema" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Raggiunto limite di sistema apertura file" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Il sottosistema di rete ha fallito" @@ -7331,19 +7356,19 @@ msgid "T&oolbar" msgstr "&Barra strumenti" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Connessione TSL stabilita. Invio richiesta HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "Connessione TLS stabilita. In attesa del messaggio di benvenuto..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Connessione TLS stabilita." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL scaduto" @@ -7355,15 +7380,15 @@ msgid "Target file:" msgstr "File destinazione:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Il file destinazione esiste già!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Il file destinazione esiste già, continuare?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Fallimento temporaneo nella risoluzione nomi" @@ -7371,7 +7396,7 @@ msgid "Test results" msgstr "Risultati del test" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Verifica del supporto al ripristino trasferimenti sul server" @@ -7397,16 +7422,16 @@ "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:634 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "L'indirizzo inserito è: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Il membro ai_familty non è supportato" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "Il membro asock_type non è supportato" @@ -7446,12 +7471,12 @@ 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: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 "Il programma predefinito per i file di testo non è disponibile." -#: ../../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 "Il programma predefinito per i file di testo è '%s'." @@ -7462,7 +7487,7 @@ 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/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 "L'estensione '%s' è già è presente nella lista" @@ -7478,7 +7503,7 @@ "Inserisci un nuovo nome:" #: ../../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" @@ -7511,7 +7536,7 @@ msgstr "Impossibile caricare il file '%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" @@ -7521,7 +7546,7 @@ "Nessun programma è stato associato sul vostro sistema con questo file." #: ../../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" @@ -7543,7 +7568,7 @@ "comportare una perdita dati.\n" "Vuoi continuare?" -#: ../../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" @@ -7592,7 +7617,7 @@ msgid "The following files are currently being edited:" msgstr "Sono in corso modifiche ai seguenti file remoti:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "La soluzione FTP open source gratuita" @@ -7614,17 +7639,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, 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:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "La cartella locale '%s' non esiste." -#: ../../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" @@ -7635,7 +7660,7 @@ "Disabilitare la navigazione sincronizzata e continuare le modifiche della " "cartella locale?" -#: ../../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." @@ -7651,16 +7676,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "La coda non verrà salvata." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "La cartella remota '%s' non esiste." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7705,7 +7730,7 @@ msgid "The server could not be added." msgstr "Il server non può essere aggiunto." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Il server ha inviato una risposta inaspettata o sconosciuta." @@ -7739,7 +7764,7 @@ "La chiave host del server è sconosciuta. Non è possibile garantire che tale " "server sia davvero quello che vi aspettate." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Il parametro nome server non è supportato da a_socktype" @@ -7751,19 +7776,19 @@ "Le impostazioni sono state importate. FileZilla deve essere riavviato per " "rendere effettive le nuove impostazioni." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "La famiglia di indirizzi specificata non è supportata" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Il nome rete specificato non è più disponibile" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Il sistema si chiuderà a meno che non fate clic su [Annulla]." @@ -7775,7 +7800,7 @@ "Il file destinazione esiste già.\n" "Scegliere un'azione." -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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?" @@ -7788,15 +7813,15 @@ msgid "Themes" msgstr "Temi" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Questo gruppo di filtri non può essere eliminato." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Questo gruppo di filtri non può essere rinominato." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7821,7 +7846,7 @@ "Questa procedura guidata vi aiuterà a configurare correttamente router e " "firewall e a testare le nuove impostazioni di connessione." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Ora" @@ -7834,26 +7859,26 @@ msgstr "Timeout in sec&ondi:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Timeout" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 +#: ../../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:243 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titolo:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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 " @@ -7920,15 +7945,15 @@ msgid "Toggles the display of the transfer queue" msgstr "Visualizza o nasconde la finestra della coda di trasferimento" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Riga di intestazione troppo lunga" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Troppi re-indirizzamenti" -#: ../../locales/../src/engine/logging.cpp:113 +#: ../../locales/../src/engine/logging.cpp:114 #: ../../locales/../src/interface/StatusView.cpp:289 #: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" @@ -7965,11 +7990,11 @@ msgid "Transfer connection interrupted: %s" msgstr "Connessione interrotta: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "I dati trasferiti sono stati alterati." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Trasferimento in corso" @@ -7978,8 +8003,8 @@ msgid "Transfers" msgstr "Trasferimenti" +#: ../../locales/../src/interface/QueueView.cpp:2944 #: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Trasferimenti completati" @@ -7991,11 +8016,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "I seguenti tipi di &file saranno interpretati come file ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Conferma chiave host modificata:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Conferma nuova chiave host:" @@ -8037,7 +8062,7 @@ msgid "U&pload" msgstr "&Invia" -#: ../../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 "Limite di &upload:" @@ -8048,20 +8073,20 @@ "U&sa il programma associato dal sistema al tipo di file (se disponibile)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "U&sa le impostazioni predefinite del sistema" +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 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Codice errore non assegnato %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:242 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Unità:" @@ -8070,11 +8095,11 @@ msgid "Unknown" msgstr "Sconosciuto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Tipo proxy FTP sconosciuto, impossibile generare sequenza login." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versione protocollo SOCK sconosciuta: %d" @@ -8087,7 +8112,7 @@ msgid "Unknown host key" msgstr "Chiave host sconosciuta" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8100,8 +8125,8 @@ "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:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../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." @@ -8109,7 +8134,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:599 +#: ../../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." @@ -8117,11 +8142,11 @@ "Finché non sarà risolto questo problema, la modalità FTP attiva non " "funzionerà e dovrà essere utilizzata la modalità passiva." -#: ../../locales/../src/engine/tlssocket.cpp:1074 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Tipo certificato non supportato" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Redirezione non supportata" @@ -8191,12 +8216,12 @@ msgid "Use &custom editor:" msgstr "Usa &programma personalizzato:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Usa navigazione &sincronizzata" @@ -8224,8 +8249,8 @@ msgstr "Usa server dal Gestore siti" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Usa le impostazioni pre&definite del sistema" +msgid "Use system &defaults for current language" +msgstr "Usa valori pre&definiti sistema per la lingua attuale" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8262,7 +8287,7 @@ msgid "User:" msgstr "Utente:" -#: ../../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 "Il nome utente non può essere una serie di spazi" @@ -8286,7 +8311,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Messaggi dettagliati log di wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1124 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Verifica del certificato in corso..." @@ -8294,7 +8319,7 @@ msgid "Very high" msgstr "Molto alto" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "L'opzione 'visualizza file nascosti' non è supportata dal server" @@ -8310,15 +8335,15 @@ msgid "W&rite" msgstr "S&crittura" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "In attesa" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "In attesa di connessione" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "In attesa della password" @@ -8330,7 +8355,7 @@ msgid "Waiting to retry..." msgstr "In attesa di un nuovo tentativo..." -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Avvertimento, connessione dati da IP sbagliato ignorata." @@ -8353,11 +8378,11 @@ msgid "Warning: Potential security breach!" msgstr "Attenzione: Potenziale falla di sicurezza!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "benvenuti in FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Novità" @@ -8365,7 +8390,7 @@ msgid "What's new:" msgstr "Novità:" -#: ../../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." @@ -8390,7 +8415,7 @@ msgid "Widescreen" msgstr "Widescreen" -#: ../../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 deve memorizzare la password?" @@ -8398,20 +8423,20 @@ msgid "Wr&ite" msgstr "Scr&ittura" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Indirizzo IP esterno non valido" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Terminazioni di riga non corrette" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Sì" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8423,7 +8448,7 @@ msgid "You are using the latest version of FileZilla." msgstr "La versione di FileZilla è aggiornata." -#: ../../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 "" "E' possibile aprire questa finestra di dialogo dal menu della Guida in linea." @@ -8462,18 +8487,18 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 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: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?" @@ -8481,7 +8506,7 @@ "Sono stati selezionati selezionati più di 10 file o cartelle da aprire; " "continuare?" -#: ../../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 "Inserisci un nome host." @@ -8490,30 +8515,30 @@ msgid "You have to enter a key file path" msgstr "Devi inserire il percorso del file chiave" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Inserisci il nome di una cartella locale." -#: ../../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 "Inserisci un indirizzo IP valido." +#: ../../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 "Devi inserire un indirizzo IP v4 valido." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Inserisci il nome di una cartella locale scrivibile." -#: ../../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 "Inserisci un nome account" -#: ../../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 "Specificare un nome utente" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8567,23 +8592,23 @@ "È necessario inserire sia il percorso locale che quello remoto per abilitare " "la navigazione sincronizzata per questo sito." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "È necessario specificare un file locale." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "È necessario specificare un file remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "È necessario specificare un percorso remoto." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "È necessario specificare il nome di un server." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8591,7 +8616,7 @@ "Non si dovrebbero avere problemi di connessione ad altri server, i " "trasferimenti dei file dovrebbero funzionare correttamente." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Il sistema sarà messo in sospensone a meno fai clic su [Annulla]." @@ -8616,7 +8641,7 @@ msgid "contains" msgstr "contiene" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "personalizzato" @@ -8638,19 +8663,19 @@ msgid "equals" msgstr "uguale 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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "file" -#: ../../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 " @@ -8660,15 +8685,15 @@ "Assicurarsi che l'eseguibile di fzputtyget sia presente nella stessa " "cartella dell'eseguibile di FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp appartiene ad una differente versione di FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "non è stato possibile avviare fzsftp" -#: ../../locales/../src/engine/tlssocket.cpp:1103 +#: ../../locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers ha ritornato nessun certificato" @@ -8724,10 +8749,10 @@ msgid "owner writeable" msgstr "scrivibile per il proprietario" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1167 -#: ../../locales/../src/engine/tlssocket.cpp:1178 -#: ../../locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 "sconosciuto" @@ -8748,6 +8773,30 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Connected" +#~ msgstr "Connesso" + +#~ msgid "Deleting directories" +#~ msgstr "Eliminazione cartelle" + +#~ msgid "Deleting multiple unrelated directories is not yet supported" +#~ msgstr "Eliminazione di cartelle multiple non dipendenti non supportato" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Download di cartelle multiple non dipendenti non supportato" + +#~ msgid "Downloading search results" +#~ msgstr "Download risultati ricerca" + +#~ msgid "You have to enter a valid IP address." +#~ msgstr "Inserisci un indirizzo IP valido." + +#~ msgid "U&se system defaults" +#~ msgstr "U&sa le impostazioni predefinite del sistema" + +#~ msgid "Use system &defaults" +#~ msgstr "Usa le impostazioni pre&definite del sistema" + #~ msgid "" #~ "Enter the password for the file '%s'.\n" #~ "Please note that the converted file will not be password protected." diff -Nru filezilla-3.14.1/locales/Makefile.in filezilla-3.15.0.2/locales/Makefile.in --- filezilla-3.14.1/locales/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/locales/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -174,6 +174,8 @@ 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@ diff -Nru filezilla-3.14.1/locales/nb_NO.po filezilla-3.15.0.2/locales/nb_NO.po --- filezilla-3.14.1/locales/nb_NO.po 2015-09-09 14:05:02.000000000 +0000 +++ filezilla-3.15.0.2/locales/nb_NO.po 2016-02-05 08:54:46.000000000 +0000 @@ -1,15 +1,15 @@ # Norwegian bokmål translation of FileZilla -# Copyright (C) 2015 Tim Kosse +# Copyright (C) 2016 Tim Kosse # This file is distributed under the same license as the filezilla package. -# Åka Sikrom , 2015. -# +# Åka Sikrom , 2015-2016. +# msgid "" msgstr "" "Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2015-09-06 22:23+0100\n" -"Last-Translator: Åka Sikrom \n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-26 08:52+0100\n" +"Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmål \n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -48,9 +48,9 @@ msgstr[0] "%d mappe" msgstr[1] "%d mapper" -#: ../../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" @@ -59,9 +59,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" @@ -82,12 +82,12 @@ msgstr[0] "%d fil. Total størrelse: Minst %s" msgstr[1] "%d filer. Total størrelse: Minst %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -127,7 +127,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Sertifikat utgått!" @@ -159,7 +159,7 @@ msgstr[0] "%s byte" msgstr[1] "%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 " @@ -173,7 +173,7 @@ "Last ned FileZilla på nytt. Send gjerne en feilrapport hvis problemet " "vedvarer." -#: ../../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 " @@ -189,7 +189,7 @@ "- 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»." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s med %d bits" @@ -203,7 +203,7 @@ msgid "%w - Proxy password" msgstr "%w - mellomtjener-passord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "Avbryt tidligere tilkobling og koble til i gjeldende fane" @@ -256,7 +256,7 @@ msgid "&Always use default editor" msgstr "&Bruk alltid standard redigeringsprogram" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Bruk alltid dette valget for filer uten tilordnet program" @@ -294,9 +294,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 @@ -309,8 +309,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" @@ -383,14 +383,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 "&Slett" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Slett symbolsk lenke" @@ -398,13 +398,13 @@ msgid "&Directory comparison" msgstr "&Mappesammenlikning" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -430,7 +430,7 @@ msgid "&Display size in bytes" msgstr "&Vis størrelser i byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Ikke husk passord (anbefales)" @@ -451,7 +451,7 @@ msgid "&Download" msgstr "&Last ned" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Last ned til:" @@ -484,7 +484,7 @@ msgid "&Enable compression" msgstr "&Slå på komprimering" -#: ../../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 "&Bruk hastighetsgrenser" @@ -501,7 +501,7 @@ msgid "&Enter custom command..." msgstr "&Skriv inn kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Opprett tilkobling i ny fane" @@ -554,7 +554,7 @@ msgid "&Finish editing and delete local file" msgstr "Avslutt redigering og slett lokal &fil" -#: ../../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" @@ -562,7 +562,7 @@ "&Bruk flat struktur på eksterne filstier, og last ned alle filer direkte til " "målmappe" -#: ../../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ølg symbolske lenker, og slett innholdet i målmappa" @@ -625,7 +625,7 @@ msgid "&Install new version" msgstr "&Installer ny versjon" -#: ../../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 "&Hold ekstern mappestruktur relativ til søkeroten" @@ -650,7 +650,7 @@ msgstr "&Lokalt mappetre" #: ../../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 "&Lokal mappe:" @@ -714,11 +714,11 @@ msgid "&New Site" msgstr "&Ny tjener" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Ny versjon tilgjengelig!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Neste >" @@ -741,7 +741,7 @@ msgstr "&Numerisk verdi:" #: ../../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 "&OK" @@ -818,12 +818,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Husk passordet frem til FileZilla lukkes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Husk passord" #: ../../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 "&Ekstern mappe:" @@ -844,7 +844,7 @@ msgstr "Fjern &valgte" #: ../../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 @@ -905,7 +905,7 @@ msgid "&Save as..." msgstr "Lagre &som …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Søk" @@ -974,7 +974,7 @@ msgid "&Speed limits" msgstr "&Hastighetsgrenser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Start overføring umiddelbart" @@ -986,7 +986,7 @@ msgid "&TLS Ciphers" msgstr "&TLS-krypteringsmetoder" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Test" @@ -1029,7 +1029,7 @@ msgid "&Uploads:" msgstr "&Opplastinger:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Bruk selvvalgt program" @@ -1063,7 +1063,7 @@ msgid "&Username:" msgstr "&Brukernavn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Versjon %s" @@ -1108,12 +1108,12 @@ msgid "'%s' is not a directory." msgstr "«%s» er ikke en mappe." -#: ../../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 "Innloggingstype «Konto» støttes ikke av valgt protokoll" -#: ../../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." @@ -1129,7 +1129,7 @@ "Innloggingstypene «Normal» og «Konto» er ikke tilgjengelig. Innstillinga er " "derfor endret til «Be om passord»." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1187,8 +1187,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(f.eks. %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 @@ -1247,7 +1247,7 @@ msgid "64-bit system" msgstr "64-bit-system" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Tilbake" @@ -1268,7 +1268,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 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." @@ -1297,7 +1297,7 @@ "En fil med dette navnet er under redigering. Lukk fila i " "redigeringsprogrammet og prøv igjen." -#: ../../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 " @@ -1314,7 +1314,7 @@ msgid "A new version of FileZilla is available:" msgstr "Det har kommet en ny versjon av FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1331,7 +1331,7 @@ "En korrekt oppsatt tjener skal ikke kreve dette. Ta kontakt med " "administrator for tjenermaskinen hvis valget likevel viser seg nødvendig." -#: ../../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?" @@ -1385,11 +1385,11 @@ #: ../../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: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" @@ -1415,7 +1415,7 @@ msgid "Active mode" msgstr "Aktiv modus" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1423,7 +1423,7 @@ "Test av aktiv FTP-modus mislyktes. FileZilla vet ikke hva som er korrekt " "ekstern IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1431,7 +1431,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:595 +#: ../../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 " @@ -1444,7 +1444,7 @@ msgid "Active mode IP" msgstr "IP for aktiv modus" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "&Bare legg filer i kø" @@ -1463,7 +1463,7 @@ msgid "Add to queue" msgstr "Legg i kø" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Adressetypen støttes ikke" @@ -1484,7 +1484,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Bruk alltid denne handlinga" @@ -1492,7 +1492,7 @@ msgid "Algorithm:" msgstr "Algoritme:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Alle filer ble overført uten problemer" @@ -1500,7 +1500,7 @@ 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." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../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." @@ -1515,11 +1515,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Tillat tilbakefall til alternativt overføringsmodus ved feil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Allerede tilkoblet" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativt navn:" @@ -1547,7 +1547,7 @@ "website:" msgstr "Du kan også laste ned siste versjon fra FileZilla-nettstedet:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1556,7 +1556,7 @@ "Det oppstod en feil under innlasting av overføringskø fra «%s».\n" "Enkelte oppføringer ble kanskje ikke gjenopprettet." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1565,23 +1565,23 @@ "Det oppstod en feil under lagring av overføringskø til «%s».\n" "Enkelte oppføringer ble kanskje ikke lagret." -#: ../../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 "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: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/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:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1592,11 +1592,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "Eventuelle endringer i filtrene ble ikke lagret." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Eventuelle endringer gjort på filtrene blir ikke lagret." @@ -1620,7 +1620,7 @@ msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Mellomlageret for argumenter er fullt" @@ -1638,7 +1638,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Be om passord" @@ -1650,7 +1650,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Spør operativsystemet etter ekstern IP-adresse" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Stille spørsmål på FileZilla-forumet" @@ -1670,7 +1670,7 @@ msgid "Attribute" msgstr "Attributt" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Autentisering mislyktes." @@ -1699,11 +1699,11 @@ msgid "B&ypass proxy" msgstr "&Hopp over mellomtjener" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Ugyldig fildeskriptor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Grunnleggende brukerveiledning" @@ -1716,7 +1716,7 @@ msgid "Being edited" msgstr "Redigeres" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Obs! Sertifikatet har blitt tilbaketrukket" @@ -1734,11 +1734,11 @@ msgid "Bookmark" msgstr "Bokmerke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Bokmerke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Bokmerker" @@ -1754,7 +1754,7 @@ msgid "Build information" msgstr "Byggeinformasjon" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Firmakategori:" @@ -1793,22 +1793,22 @@ msgid "CPU features:" msgstr "CPU-funksjoner:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Beregn tidsforskjell mellom klient og tjener …" -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Klarte ikke å lese fra fil" -#: ../../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 "Klarte ikke å skrive data til fil." -#: ../../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 "Klarte ikke å skrive data til fil: %s" @@ -1826,13 +1826,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 "Avbryt" @@ -1852,15 +1852,15 @@ "Fikk ikke tilgang til «%s». Kontroller at mediet er satt inn, og at enheten " "ikke er i bruk." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Klarte ikke å legge til tjeneren i tjeneroppsettet" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Klarte ikke å tildele forespurt adresse" -#: ../../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?" @@ -1882,20 +1882,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 "Klarte ikke å redigere fil" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Klarte ikke å redigere fil. Du er ikke tilkoblet en tjener." -#: ../../locales/../src/interface/LocalListView.cpp:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Klarte ikke å redigere fil, fordi ekstern sti er ukjent." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1912,11 +1912,11 @@ msgid "Cannot load key file" msgstr "Klarte ikke å laste inn nøkkelfil" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Klarte ikke å laste inn verktøylinje fra ressursfil" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Klarte ikke å lagre passord" @@ -1925,22 +1925,22 @@ msgid "Cannot rename entry" msgstr "Klarte ikke å gi nytt navn" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Klarte ikke å gi fila nytt navn" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Klarte ikke å lagre filtersett" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Klarte ikke å velge filter" @@ -2007,7 +2007,7 @@ 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:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Problem med tegnkoding" @@ -2035,7 +2035,7 @@ msgid "Check for updates failed" msgstr "Klarte ikke å se etter oppdateringer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2043,7 +2043,7 @@ "Kontroller akkreditivene dine. Passordet du skrev inn begynner eller slutter " "med mellomrom." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2051,7 +2051,7 @@ "Kontroller akkreditivene dine. Brukernavnet du skrev inn begynner eller " "slutter med mellomrom." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Sjekker etter korrekt ekstern IP-adresse" @@ -2059,12 +2059,12 @@ msgid "Checking for updates..." msgstr "Se etter oppdateringer …" -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrollsum samsvarer med fila %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrollsum samsvarer ikke med fila %s\n" @@ -2079,11 +2079,11 @@ #: ../../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 "Velg lokal mappe" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Chunk-data ikke skikkelig terminert" @@ -2121,7 +2121,7 @@ msgid "Clear quickconnect bar" msgstr "Tøm hurtigtilkoblingslinje" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Klikk Ferdig for å lagre oppsettet." @@ -2138,8 +2138,8 @@ msgstr "Lukk &alle andre faner" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Lukk FileZilla" @@ -2167,13 +2167,13 @@ msgid "Command and its arguments should be properly quoted." msgstr "Kommandoer og eventuelle argumenter må angis korrekt." -#: ../../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 "Kommando mislyktes" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Kommandoen støttes ikke" @@ -2181,9 +2181,9 @@ msgid "Command not supported by this protocol" msgstr "Kommandoen støttes ikke av denne protokollen" -#: ../../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 "Kommando:" @@ -2191,12 +2191,12 @@ msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Navn:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Kommunikasjonen ødelagt av ruteren eller brannmuren" @@ -2243,7 +2243,7 @@ msgstr "Samtidige overføringer" #: ../../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 "Skill mellom små og store bokst&aver" @@ -2259,24 +2259,24 @@ msgid "Configure port range" msgstr "Velg portområde" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Oppsett av av FileZilla og nettverk" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Bekreft sletting" -#: ../../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 "Bekreftelse kreves" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Godt jobba! Oppsettet ser ut til å fungere." @@ -2284,6 +2284,11 @@ msgid "Connect bypassing proxy settings" msgstr "Koble til uten å bruke mellomtjener-oppsett" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Tilkobling mislyktes. %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Koble til i gjeldende fane" @@ -2296,29 +2301,25 @@ msgid "Connect to specified Site Manager site" msgstr "Koble til valgt tjener fra Tjeneroppsett" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Tilkoblet" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Kobler til" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Kobler til %s via %s-mellomtjener" -#: ../../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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Kobler til %s …" @@ -2327,119 +2328,123 @@ msgid "Connection" msgstr "Tilkobling" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Tilkobling avbrutt" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Tilkoblingsforsøk mislyktes" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Tilkoblingsforsøk mislyktes med «%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 "Tilkoblingsforsøket ble avbrutt av bruker" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Tilkoblingsforsøk gikk ut på tid" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Tilkobling lukket" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Tilkobling ble lukket lukket av tjener" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Tilkobling etablert. Laster inn TLS …" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Tilkoblet. Sender HTTP-forespørsel" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Tilkoblet. Venter på velkomstmelding." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Tilkoblet. Venter på velkomstmelding …" -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Tilkobling mistet" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Tilkoblinga tillates ikke av regelsett" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Tilkoblinga ble nektet" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Tjeneren nektet tilkobling" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Tjeneren lukket tilkobling" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Tjeneren tilbakestilte tilkobling" -#: ../../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] "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:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Tidsavbrudd på tilkobling." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Mistet tilkoblinga til tjener." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Tilkoblet mellomtjener. Utfører hilseprosess …" -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Tilkobling til tjeneren ble lukket for tidlig." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Tilkobling til testtjener mislyktes." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Konverter nøkkelfil" #: ../../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 "Kopi (%d) av %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 "Kopi av %s" @@ -2449,7 +2454,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopier valgte objekters nettadresser til utklippstavle." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Klarte ikke å akseptere tilkobling: %s" @@ -2459,30 +2464,30 @@ msgid "Could not add connection to Site Manager" msgstr "Klarte ikke å legge tilkoblinga i Tjeneroppsett" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Klarte ikke å fullføre handlinga" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Klarte ikke å koble til tjeneren" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Klarte ikke å koble til tjeneren: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 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: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 "Klarte ikke å konvertere privatnøkkel" -#: ../../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 "Klarte ikke å kopiere nettadresser" @@ -2490,17 +2495,17 @@ msgid "Could not copy data" msgstr "Klarte ikke å kopiere data" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Klarte ikke å lage den lokale fila %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Klarte ikke å lage loggføringsmutex %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" @@ -2511,11 +2516,11 @@ "Skallutvidelsen er ikke installert, eller du dro ikke filene til et " "utforskervindu." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Klarte ikke å opprette forbindelse med tjeneren" -#: ../../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 " @@ -2526,11 +2531,11 @@ "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:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Klarte ikke å lage tilpasset innloggingssekvens." -#: ../../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" @@ -2538,7 +2543,7 @@ "Fant ikke «distinguished name» på sertifikatutsteder. " "«gnutls_x509_get_issuer_dn» mislyktes" -#: ../../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" @@ -2546,26 +2551,31 @@ "Fant ikke «distinguished name» på sertifikatsubjekt. «gnutls_x509_get_dn» " "mislyktes" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Klarte ikke å hente fullstendig ekstern filsti" -#: ../../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 "Fikk ikke svar fra 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 "Klarte ikke å finne fram en midlertidig mappe å laste ned fila til." -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2589,11 +2599,11 @@ msgid "Could not load key file" msgstr "Klarte ikke å laste inn nøkkelfil" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Klarte ikke å laste inn privatnøkkel" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2604,7 +2614,7 @@ "Vil du slå av synkronisert filbehandling og fortsette med å endre ekstern " "mappe?" -#: ../../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 " @@ -2614,7 +2624,7 @@ "Fant ikke lokal mappe som tilsvarer den eksterne mappa «%s».\n" "Synkronisert filbehandling er derfor slått av." -#: ../../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 " @@ -2625,14 +2635,14 @@ "Synkronisert filbehandling har blitt slått av." #: ../../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 "Klarte ikke å åpne utklippstavle" -#: ../../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 "Klarte ikke å åpne loggfil: %s" @@ -2645,42 +2655,50 @@ msgid "Could not parse server address:" msgstr "Ugyldig tolkning av tjeneradresse:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Klarte ikke å lese fra datasokkel." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Klarte ikke å lese fra sokkel: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Klarte ikke å lese tjenerobjekt." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +msgid "Could not receive data from server." +msgstr "Klarte ikke å motta data fra tjeneren." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 #, 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:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Klarte ikke å sende kommando til fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Klarte ikke å frembringe IO-tråd" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Klarte ikke å starte hilseprosess med mellomtjener: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Klarte ikke å starte overføring" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2700,7 +2718,7 @@ 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:1850 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2709,9 +2727,9 @@ "Klarte ikke å lagre «%s». Køen er ikke lagret.\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 "Klarte ikke å lagre «%s». Valgte tjenere er ikke eksportert: %s" @@ -2721,28 +2739,28 @@ msgid "Could not write \"%s\":" msgstr "Klarte ikke å lagre «%s»." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Klarte ikke å lagre nøkkelfil. %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Klarte ikke å skrive til lokal fil" -#: ../../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 "Klarte ikke å skrive til loggfil: %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 "Klarte ikke å skrive til sokkel: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Land:" @@ -2750,11 +2768,11 @@ msgid "Crea&te new file" msgstr "La&g ny fil" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Lag manglende lokal &mappe, og gå inn i den" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Lag manglende ekstern &mappe, og gå inn i den" @@ -2783,45 +2801,45 @@ msgid "Create director&y and enter it" msgstr "Lag map&pe, og gå inn i den" -#: ../../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 "Ny mappe" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Lag tom fil" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Oppretter mappe" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Oppretter mappa «%s» …" -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kritisk feil" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kritisk feil:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Krisik filoverføringsfeil" -#: ../../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 "Kritisk filoverføringsfeil etter overføring av %s i løpet av %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" @@ -2852,7 +2870,7 @@ msgid "Cus&tom" msgstr "Selvvalg&t" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Selvvalgt filtersett" @@ -2879,6 +2897,10 @@ msgid "D&elete" msgstr "&Slett" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Sammenl&ikning av mapper" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Slå &av alle" @@ -2892,7 +2914,7 @@ msgstr "Ved d&obbeltklikk på mapper:" #: ../../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 "D&uplikat" @@ -2908,8 +2930,8 @@ msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Datasokkel ble lukket for tidlig." @@ -3030,19 +3052,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Sletter %u filer fra «%s»" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Sletter mapper" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Sletting av flere urelaterte mapper samtidig støttes ikke ennå" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Sletter symbolsk lenke" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Skrivebord" @@ -3064,7 +3078,7 @@ msgid "Dire&ctories" msgstr "&Mapper" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Retning" @@ -3072,13 +3086,13 @@ msgid "Directory" msgstr "Mappe" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Sammenlikning av mapper" @@ -3090,11 +3104,11 @@ 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:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Mappelisting avbrutt av bruker" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Mappevisning mislyktes." @@ -3102,12 +3116,12 @@ msgid "Directory listing filters" msgstr "Filtre for mappevisning" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Mappevisning av «%s» vellykket" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Mappevisning fullført" @@ -3115,13 +3129,13 @@ msgid "Disa&ble all" msgstr "Slå &av alle" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3132,23 +3146,23 @@ msgid "Disconnect from server" msgstr "Koble fra tjener" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Koblet fra tjener" -#: ../../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 "Koblet fra tjener: %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 "Kobler fra forrige tjener" @@ -3174,8 +3188,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Er du sikker på at du vil lukke FileZilla?" @@ -3198,7 +3212,7 @@ 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:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, 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?" @@ -3207,7 +3221,7 @@ msgid "Do you want to reopen this file?" msgstr "Vil du åpne denne fila på nytt?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentasjon" @@ -3228,7 +3242,7 @@ msgid "Download" msgstr "Last ned" -#: ../../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 "Ned&lastingsgrense:" @@ -3242,9 +3256,9 @@ msgid "Download limit: none" msgstr "Nedlastingsgrense: ingen" -#: ../../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 "Last ned søkeresultater" @@ -3256,7 +3270,7 @@ msgid "Download selected files and directories" msgstr "Last ned valgte filer og mapper" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3269,26 +3283,18 @@ msgid "Downloading" msgstr "Laster ned" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Laster ned %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Nedlasting av flere urelaterte mapper samtidig støttes ikke ennå" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Laster ned søkeresultater" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Laster ned oppdatering …" -#: ../../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 "" @@ -3298,9 +3304,9 @@ "Dra-og-slipp mellom forskjellige instanser av FileZilla er ikke implementert " "ennå." -#: ../../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." @@ -3334,7 +3340,7 @@ msgid "E&xport..." msgstr "&Eksporter …" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-post:" @@ -3352,16 +3358,16 @@ msgstr "" "Rediger fila med valgt redigeringsprogram, og last opp endringene til tjener." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Redigering av mapper støttes ikke" -#: ../../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 "Redigering mislyktes" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Redigerer søkeresultater" @@ -3369,7 +3375,7 @@ msgid "Email:" msgstr "Epost:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Tom kommando" @@ -3377,7 +3383,7 @@ msgid "Empty command." msgstr "Tom kommando" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Tom mappeliste" @@ -3423,7 +3429,7 @@ msgid "Encryption details" msgstr "Krypteringsdetaljer" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Vil du avslutte sammenlikning og endre sorteringsrekkefølge?" @@ -3431,15 +3437,15 @@ msgid "Enter &custom command..." msgstr "&Skriv inn kommando …" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Skriv inn 0 for ubegrenset hastighet." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Angi kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Skriv inn kommando" @@ -3453,11 +3459,11 @@ msgid "Enter filter name" msgstr "Angi filternavn" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Skriv inn et navn for filtersettet." -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Skriv inn nytt navn for filtersett" @@ -3497,7 +3503,7 @@ "- ftps:// for FTP via TLS (implisitt)\n" "- ftpes:// for FTP via TLS (eksplisitt)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3527,7 +3533,7 @@ msgid "Error importing" msgstr "Feil ved importering" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Feil ved lasting av kø" @@ -3536,50 +3542,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/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: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:939 msgid "Error loading xml file" msgstr "Feil ved innlasting av xml-fil" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Feil ved lagring av kø" -#: ../../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 "Feil ved oppstart av program" #: ../../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: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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Feil ved skriving til xml-fil" -#: ../../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 "Feil:" @@ -3671,24 +3677,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP via implisitt 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/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 "Klarte ikke å bytte mappe" -#: ../../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 "Feil ved endring av språket" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Klarte ikke å kopiere eller flytte lagrede tjenere" @@ -3696,132 +3702,136 @@ msgid "Failed to create backup copy of xml file" msgstr "Klarte ikke å lage sikkerhetskopi av xml-fil" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Klarte ikke å lage lyttesokkel. Avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Fant ikke sti til «Mine dokumenter»" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Fant ikke filsti til skrivebordet" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "Fant ikke maskinadressen for kontrolltilkobling. Tilkobling lukket." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Feil ved innlasting av FTP-motoren." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Feil ved initialisering av TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Klarte ikke å starte nettverksfunksjoner." + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Feil ved lasting av paneler, ugyldige resursfiler?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Feil ved lasting av privat nøkkel: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Klarte ikke å åpne «%s» for tilføying/skriving" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Klarte ikke å åpne «%s» for lesing" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Klarte ikke å åpne «%s» for skriving" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Klarte ikke å tolke mottatt filsti." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Klarte ikke å ta imot data" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Feil ved mottak av mappeliste" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Fant ikke ekstern IP-adresse. Avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "Fant ikke ekstern IP-adresse. Bruker lokal adresse" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Fant ikke lokal IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Fant ikke lokal IP-adresse. Avslutter" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Fant ikke ekstern IP-adresse." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Klarte ikke å sende kommando." -#: ../../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 "Feil ved endring av språk til %s (%s). Bruker standard systemspråk" -#: ../../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 "" "Feil ved endring av språk til %s (%s). Bruker standard systemspråk (%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 "Feil ved endring av språk til %s (%s). Bruker standard systemspråk." -#: ../../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 "Feil ved endring av språk til %s. Bruker standard systemspråk" -#: ../../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 "" "Feil ved endring av språk til %s. Bruker standard systemspråk (%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 "Feil ved endring av språk til %s. Bruker standard systemspråk." @@ -3830,11 +3840,11 @@ msgid "Failed to validate settings" msgstr "Klarte ikke å kontrollere oppsettet" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Bekreftelse av sertifikat mislyktes" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Klarte ikke å skrive til fil %s" @@ -3867,7 +3877,7 @@ msgid "File Types" msgstr "Filtyper" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Fildeskriptor er ikke en sokkel" @@ -3879,7 +3889,7 @@ msgid "File editing" msgstr "Filredigering" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Fila eksisterer" @@ -3896,8 +3906,8 @@ msgstr "Fillister" #: ../../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 "Fil ikke funnet" @@ -3906,38 +3916,38 @@ msgid "File search" msgstr "Filsøk" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Overføring avbrutt av bruker" -#: ../../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 "Filoverføring avbrutt av bruker etter overføring av %s i løpet av %s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Filoverføring mislyktes" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Filoverføring hoppet over" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Filoverføring vellykket" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Filoverføring pågår fremdeles." @@ -3949,7 +3959,7 @@ msgid "File would transfer with binary data type." msgstr "Fila ville blitt overført i binærform." -#: ../../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" @@ -3962,11 +3972,11 @@ msgstr "" "FileZilla kan nå teste oppsettet og kontrollere om alt er satt opp skikkelig." -#: ../../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 er allerede tilkoblet en tjener." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -3980,7 +3990,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 @@ -3991,13 +4001,13 @@ msgid "Filename &filters..." msgstr "&Filnavnfiltre …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "Klarte ikke å konstruere filnavn for mappa %s og filnavnet %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Ugyldig filnavn" @@ -4025,7 +4035,7 @@ msgstr "Filer som er åpnet for redigering nå" #: ../../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" @@ -4035,7 +4045,7 @@ msgid "Filesize format" msgstr "Filstørrelser" -#: ../../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" @@ -4073,8 +4083,8 @@ msgid "Filter out items matching none of the following" msgstr "Filtrer ut objekter som ikke samsvarer med noen av følgende" -#: ../../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 "Filtersettet finnes allerede" @@ -4088,11 +4098,11 @@ msgid "Filter validation failed" msgstr "Kontroll av filter mislyktes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Søk etter &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Søk etter m&apper" @@ -4109,7 +4119,7 @@ msgid "Fingerprint:" msgstr "Fingeravtrykk:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Veiviser for oppsett av brannmur og ruter" @@ -4141,7 +4151,7 @@ msgid "Force showing &hidden files" msgstr "Tving visning av &skjulte filer" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Tving visning av skjulte filer" @@ -4154,12 +4164,12 @@ 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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Fant ny %s: %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Mer dokumentasjon" @@ -4167,7 +4177,7 @@ msgid "General" msgstr "Generell" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Generell SOCKS-tjenerfeil" @@ -4180,12 +4190,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Få hjelp" -#: ../../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 "Filtersett-navnet finnes allerede. Vil du overskrive det?" @@ -4193,22 +4203,22 @@ msgid "Global bookmarks" msgstr "Globale bokmerker" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-feil %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-feil %d i %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-feil %d i %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-feil %d: %s" @@ -4238,17 +4248,17 @@ msgstr "Skjult" #: ../../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 "Høy" -#: ../../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 "Høyeste" -#: ../../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øyeste tilgjengelig port må være et nummer mellom 1024 og 65535." @@ -4262,7 +4272,7 @@ msgid "Homepage:" msgstr "Nettside:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Verten er frakoblet" @@ -4278,7 +4288,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Vertsnavnet begynner med «[», men slutter ikke på «]»." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Fikk ikke forbindelse med tjeneren" @@ -4297,7 +4307,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (f.eks. 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adresser støttes ikke med SOCKS4-mellomtjenere" @@ -4342,7 +4352,7 @@ "administrator." msgstr "Kontakt administrator for tjenermaskinen hvis nøkkelbyttet er uventet." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4350,7 +4360,7 @@ "Hvis problemet vedvarer er det en ruter og/eller brannmur som fortsetter å " "blokkere FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4368,7 +4378,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: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." @@ -4376,14 +4386,14 @@ "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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Ta konakt med fabrikanten av aktuell ruter hvis problemet ikke forsvinner." @@ -4421,7 +4431,7 @@ "Hvis du velger test, kobler FileZilla til probe.filezilla-project.org og " "utfører noen enkle tester." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Dersom FileZilla lukkes, mister du endringene dine." @@ -4445,7 +4455,7 @@ "Hvis du har problemer med å motta mappelister eller overføre filer, kan du " "bytte standard overføringstype." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4479,7 +4489,7 @@ "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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4539,7 +4549,7 @@ "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:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4547,7 +4557,7 @@ "Ufullstendig kjede, toppsertifikatet er ikke en selvsignerbar " "sertifikatsutsteders sertifikat" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Feil passord" @@ -4559,17 +4569,21 @@ "Klarte ikke å hente informasjon om nyeste versjon av FileZilla. Prøv igjen " "senere." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Laster inn TLS …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../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 "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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4577,29 +4591,29 @@ msgid "Interface" msgstr "Grensesnitt" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Avbrutt av signal" -#: ../../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 "Avbrutt av bruker" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Ugyldig Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Ugyldig HTTP-respons" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Sendte ugyldig argument" -#: ../../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." @@ -4607,18 +4621,19 @@ "Ugyldig tegnsekvens mottatt. Slår av UTF-8. Velg UTF-8 i tjeneroppsettet for " "å tvinge bruk av UTF-8." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Ugyldig chunk-størrelse" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Ugyldig data mottatt" -#: ../../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 "Ugyldig dato" @@ -4658,38 +4673,38 @@ "ftps:// for FTP via TLS (implisitt) og\n" "ftpes:// for FTP via TLS (eksplisitt)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Ugyldig regulært uttrykk i søkekriteriene." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Ugyldig reponskode" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Ugyldige søkekriterier: %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 "Ugyldig tjenersti" @@ -4701,23 +4716,23 @@ msgid "Invalid username given." msgstr "Ugyldig brukernavn angitt." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "«ai_flags» har ugyldig verdi" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Ugyldig hintverdi" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Jurisdiksjonsland:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Jurisdiksjonslokalitet:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Jurisdiksjonsstat eller provins:" @@ -4725,7 +4740,7 @@ msgid "Keep directories on top" msgstr "Ha mapper på toppen" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4760,11 +4775,11 @@ msgid "Language" msgstr "Språk" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Språk endret" -#: ../../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" @@ -4794,7 +4809,7 @@ msgid "Limit:" msgstr "Grense:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Linjelengde overskredet" @@ -4802,13 +4817,14 @@ msgid "Linked against" msgstr "Lenket med" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Lyttesokkel lukket" -#: ../../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 "Liste:" @@ -4821,11 +4837,11 @@ msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Lokal adresse er i bruk" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Lokalt endepunkt er lukket" @@ -4833,21 +4849,21 @@ msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Lokal fil finnes ikke." -#: ../../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 "Lokal fil er %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 "Lokale fil er en mappe, i stedet for en vanlig fil." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Lokal fil er ikke et gyldig filnavn." @@ -4859,7 +4875,7 @@ msgid "Local site:" msgstr "Lokal maskin:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Lokalitet:" @@ -4867,12 +4883,16 @@ msgid "Log file" msgstr "Loggfil" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Logget inn" + #: ../../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:801 +#: ../../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." @@ -4881,7 +4901,7 @@ "tjeneren støtter UTF-8. Klarte ikke å falle tilbake på lokalt tegnsett nå, " "fordi du bruker mellomtjener." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4889,7 +4909,7 @@ "Innloggingsdata inneholder ikke-ASCII tegn, og tjeneren støtter kanskje ikke " "UTF-8. Prøver lokalt tegnsett." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../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." @@ -4908,17 +4928,17 @@ "Innloggingstype kan bare brukes sammen med FTP-nettadresser. Verdien må være " "enten «%s» eller «%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 "Lav" -#: ../../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 "Laveste" -#: ../../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 "Laveste tilgjengelig port må være et nummer mellom 1024 og 65535." @@ -4932,44 +4952,44 @@ "Kontroller at fila er tilgjengelig, og at den er et korrekt formatert («well-" "formed») XML-dokument." -#: ../../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 "Feilformatert datastykke: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Feilformatert hode: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Manuell overføring" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Samsvarer med alle følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Samsvarer med hvilke som helst av følgende" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Samsvarer ikke med noen av følgende" @@ -4977,12 +4997,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Maksimalt antall samtidige &overføringer:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Minnetildelingsfeil" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Meldingslogg" @@ -4990,7 +5010,7 @@ msgid "Message log position" msgstr "Meldingsloggens posisjon" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Meldinga er for lang" @@ -5010,15 +5030,15 @@ msgid "Move &up" msgstr "Flytt &opp" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Min Datamaskin" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Mine Dokumenter" -#: ../../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" @@ -5039,7 +5059,7 @@ msgstr "Navnet finnes allerede" #: ../../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 "Navn på bokmerke finnes allerede." @@ -5055,7 +5075,7 @@ msgid "Need to enter filter name" msgstr "Du må skrive inn et filternavn" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Du må skrive inn en gyldig ekstern filsti" @@ -5063,18 +5083,18 @@ msgid "Need to specify a character encoding" msgstr "Du må velge tegnkoding." -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Hverken «nodename» eller «servname» er oppgitt/kjent" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Nettverk utilgjengelig" @@ -5090,7 +5110,7 @@ msgid "New &tab" msgstr "Ny &fane" -#: ../../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 "Nytt bok&merke" @@ -5109,14 +5129,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 "Nytt bokmerke" -#: ../../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 "Ny mappe" @@ -5133,9 +5153,9 @@ msgid "New folder" msgstr "Ny mappe" -#: ../../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 "Ny tjener" @@ -5143,11 +5163,11 @@ msgid "Next to the transfer queue" msgstr "Ved siden av overføringskøen" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Nei" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Ingen adresse er tildelt nodenavnet" @@ -5155,11 +5175,11 @@ msgid "No category to export selected" msgstr "Ingen eksporteringskategori er valgt" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Ingen kommando gitt, avslutter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Ingen ekstern IP-adresse satt, prøver standard." @@ -5181,25 +5201,25 @@ msgid "No images available" msgstr "Ingen bilder tilgjengelig" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "Ingen flere filer i kø!" -#: ../../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 "Navn på filtersettet ikke angitt." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Ingen program er tilknyttet filtypen" -#: ../../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 "Ingen program er satt opp som redigeringprogram for filtypen «%s»." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Ingen rute å tjene" @@ -5207,11 +5227,11 @@ msgid "No search results" msgstr "Ingen søkeresultater" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Ingen tjenere tilgjengelig" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Ingen støttede SOCKS5-autentiseringssmetoder" @@ -5221,7 +5241,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 "Ingen" @@ -5229,18 +5249,18 @@ msgid "None selected yet" msgstr "Ingen valgt ennå" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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" @@ -5250,16 +5270,16 @@ msgid "Not all items could be requeued for transfer." msgstr "Klarte ikke å legge alle elementer tilbake i overføringskø." -#: ../../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 "Ikke tilkoblet" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Ikke tilkoblet" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Ikke tilkoblet." @@ -5267,11 +5287,11 @@ msgid "Not connected." msgstr "Ikke tilkoblet." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Ikke lastet inn. Må laste inn WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5313,13 +5333,13 @@ #: ../../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" @@ -5336,7 +5356,7 @@ msgstr "" "Her setter vi opp valgt modus, samt tilbakefallsmodus hvis det er slått på." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Én gang" @@ -5382,8 +5402,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 "Åpning mislyktes" @@ -5405,19 +5425,19 @@ msgid "Operating System:" msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Handlinga er allerede i gang" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Handling pågår" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Denne handlinga støttes ikke" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisasjon:" @@ -5425,16 +5445,16 @@ msgid "Other SFTP options" msgstr "Andre SFTP-valg" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Annen systemfeil" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Annet:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Minnet er oppbrukt" @@ -5482,7 +5502,7 @@ 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:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Egen oppbyggingstype: %s\n" @@ -5508,7 +5528,7 @@ msgid "P&roxy host:" msgstr "Mellomtjene&r-vertsnavn:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommando ble ødelagt av ruter eller brannmur." @@ -5516,11 +5536,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssiv (anbefalt)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parameteret er ikke en gyldig nettadresse" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Tolker %d byte med versjonsinformasjon.\n" @@ -5540,13 +5560,13 @@ msgid "Passive mode" msgstr "Passiv modus" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 modus har blitt satt som standard overføringstype." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Passord nødvendig" @@ -5555,13 +5575,13 @@ msgid "Path" msgstr "Sti" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Klarte ikke å konstruere sti for for mappa %s og undermappa %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Fant ikke sti:" @@ -5580,8 +5600,8 @@ msgid "Permission" msgstr "Tillatelse" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Ingen tilgang" @@ -5594,7 +5614,7 @@ msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5611,11 +5631,11 @@ "Sett opp eventuelle brannmurer og/eller rutere slik at FileZilla kan sette " "opp utgående tilkoblinger på vilkårlige porter." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5650,7 +5670,7 @@ 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:389 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Skriv inn et nytt navn på filtersettet «%s»" @@ -5686,7 +5706,7 @@ msgid "Please enter a password for this server:" msgstr "Skriv inn et passord for denne tjeneren:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5704,7 +5724,7 @@ "Velg et tidsavbrudd på mellom 10 og 9999 sekunder (bruk 0 for å slå av " "tidsavbrudd)." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Skriv inn et unikt navn på dette filtersettet" @@ -5712,11 +5732,11 @@ msgid "Please enter a username for this server:" msgstr "Skriv inn et brukernavn for denne tjeneren:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Skriv inn en gyldig portrekkevidde." -#: ../../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 "Skriv inn en adresse til et sted hvor ekstern adresse kan hentes fra" @@ -5726,7 +5746,7 @@ 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:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5734,14 +5754,14 @@ "Skriv inn en ren FTP-kommando.\n" "Bruk av rene FTP-kommandoer tømmer hurtiglageret for mapper." -#: ../../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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Skriv inn navn på fila som skal opprettes:" @@ -5749,12 +5769,12 @@ msgid "Please enter username and password for this server:" msgstr "Skriv inn brukernavn og passord for denne tjeneren:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Skriv inn ekstern IP-adresse" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5771,7 +5791,7 @@ msgstr "" "Følg instruksjonene nøye. Galt oppsett fører til mislykkede FTP-tilkoblinger." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5779,11 +5799,11 @@ "Kontroller at FileZilla har tillatelse til å etablere utgående tilkoblinger, " "og at du har skrevet adressen til adressefinneren riktig." -#: ../../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 "Kontroller at forespurt språk er installert på systemet." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5806,7 +5826,7 @@ "andre uønskede programmer. Dette kan gi en falsk alarm som du trygt kan " "overse." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5822,7 +5842,7 @@ "Vær obs på at noen tjenere kan blokkere deg hvis du prøver å koble til for " "ofte." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5831,7 +5851,7 @@ "Kjør denne veiviseren på nytt hvis nettverksmiljøet endres, eller hvis du " "plutselig opplever problemer med tjenere som har fungert tidligere." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Velg en handling:" @@ -5866,7 +5886,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Velg nye attributter for valgte filer." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5884,8 +5904,8 @@ msgid "Positio&n of the message log:" msgstr "Plassering av meldingslogg:" -#: ../../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 "Postnummer:" @@ -5897,12 +5917,12 @@ msgid "Preallocation" msgstr "Forhåndstildeling" -#: ../../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 "Forhåndsdefinerte tjenere" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Behold timestamp på filer" @@ -5910,7 +5930,7 @@ msgid "Preview:" msgstr "Forhåndsvisning:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "Sertifikatene til primær- og datatilkoblinga samsvarer ikke." @@ -5926,7 +5946,7 @@ msgid "Prioritize directories (default)" msgstr "Prioriter mapper (standard)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Prioritet" @@ -5956,7 +5976,7 @@ msgid "Process &Queue" msgstr "Behandle &kø" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Prosessfil-tabellen er for stor" @@ -5966,11 +5986,11 @@ msgid "Processed %s in %s." msgstr "Behandlet %s i %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Kommandoen støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokollen støttes ikke på valgt sokkeltype" @@ -5987,38 +6007,42 @@ msgid "Proxy &user:" msgstr "Mellomtjener-&bruker:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Autentisering ovenfor mellomtjener mislyktes" -#: ../../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 "Hilseprosess for mellomtjener mislyktes: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Mellomtjenernavnet begynner på «[», men mangler «]» i slutten." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Svar fra mellomtjener: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" msgstr "Etterspørsel av mellomtjener mislyktes. %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Mellomtjener er valgt, men mellomtjeners vert eller port er ugyldig" @@ -6034,7 +6058,7 @@ msgid "Public permissions" msgstr "Allmenne tillatelser" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Overføringskø er ferdigbehandlet." @@ -6053,11 +6077,11 @@ msgid "Queue: empty" msgstr "Kø: tom" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Filer i kø" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Kølegging:" @@ -6074,7 +6098,7 @@ msgid "R&eset and requeue selected files" msgstr "&Nullstill og legg tilbake valgte filer i kø" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Ren FTP-kommando" @@ -6091,7 +6115,7 @@ msgid "Re&name" msgstr "&Gi nytt navn" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6107,12 +6131,12 @@ msgid "Read-only" msgstr "Skrivebeskyttet" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Er du sikker på at du vil avbryte gjeldende handling?" -#: ../../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 "" @@ -6120,37 +6144,37 @@ 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: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] "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: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 "Er du sikker på at du vil slette %s og %s fra tjeneren?" -#: ../../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 "" "Er du sikker på at du vil slette alle markerte filer og/eller mapper fra " "tjenermaskinen?" -#: ../../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 "" "Er du sikker på at du vil slette alle markerte filer og/eller mapper fra " "lokal maskin?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Årsak" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Start maskinen på nytt nå" @@ -6158,36 +6182,36 @@ msgid "Rec&urse into subdirectories" msgstr "Også i subfiler og -mapper" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Mottok TLS-varsel fra tjeneren: %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 "Mottok en mappeoppføring som ser ut til å være kodet i 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 "Mottok en linje på over 10 000 tegn, avbryter." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Mottatt data ødelagt" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Versjonsinformasjonen inneholder ugyldig(e) tegn" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Mottok ukjent TLS-varsel %d fra tjeneren" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Versjonsinformasjonen er for lang" @@ -6220,13 +6244,13 @@ msgid "Recursively deleting files and directories." msgstr "Sletter filer og mapper rekursivt." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, c-format msgid "Redirection to invalid or unsupported URI: %s" msgstr "Videresending til ugyldig eller ustøttet nettadresse: %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 "Videresending til ugyldig eller ustøttet adresse: %s" @@ -6236,7 +6260,7 @@ msgid "Refresh the file and folder lists" msgstr "Frisk opp fil- og mappelistene" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Vil du at programmet skal huske passord?" @@ -6244,20 +6268,20 @@ msgid "Remote" msgstr "Ekstern" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Fil på tjenermaskin" -#: ../../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 "Eksternt filsøk" @@ -6296,11 +6320,11 @@ "Klarte ikke å tolke ekstern filsti. Kontroller at stien er en gyldig og " "absolutt filsti." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Klarte ikke å tolke ekstern filsti." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Håndtering av ekstern filsti:" @@ -6340,30 +6364,30 @@ msgid "Rename selected files and directories" msgstr "Gi nytt navn til valgte filer og mapper" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Endrer navn fra «%s» til «%s»" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Feilrapportering og ønsker om ny funksjonalitet" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Forespørselen mislyktes eller ble avvist" @@ -6379,28 +6403,28 @@ msgid "Reset and requeue &all" msgstr "Nullstill og legg &alle tilbake i kø" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Protokollen er ukjent" -#: ../../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 "Finner IP-adresse for %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Ressursen er midlertidig utilgjengelig" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Respons:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Resultat:" @@ -6419,19 +6443,19 @@ "Å gjenoppta overføring av ASCII-filer kan skape problemer hvis tjener og " "klient bruker ulike formater for linjeendelse." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Mottar mappeliste for «%s» …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Mottar mappeliste …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../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:" @@ -6448,7 +6472,7 @@ msgid "S&hutdown system" msgstr "&Slå av datamaskin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "S&topp" @@ -6468,7 +6492,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-mellomtjener kobler til: %s" @@ -6477,33 +6501,33 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Lagre innstillinger?" -#: ../../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 "Systemadministratoren har slått av passordlagring." -#: ../../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 "Du har slått av passordlagring." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../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:1712 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "Søker etter filer å laste opp" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Søke&alternativer:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Søk i &mappe:" @@ -6519,8 +6543,8 @@ msgid "Security information" msgstr "Sikkerhetsinformasjon" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../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" @@ -6571,7 +6595,7 @@ msgstr "Velg fil for eksporterte data" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Velg fil for eksportert kø" @@ -6580,7 +6604,7 @@ msgstr "Velg fil for eksporterte innstillinger" #: ../../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 "Velg fil for eksporterte tjenere" @@ -6588,23 +6612,23 @@ msgid "Select file to import settings from" msgstr "Velg fil å importere innstillinger fra" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Velg fil for opplasting" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Gi navn til konvertert nøkkelfil" -#: ../../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 "Velg hvordan disse filene skal åpnes." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Velg målmappe for nedlasting" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Velg navn på målfil" @@ -6616,7 +6640,7 @@ msgid "Select the private data you would like to delete." msgstr "Velg hvilke private data du vil tømme." -#: ../../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." @@ -6630,7 +6654,7 @@ msgstr[0] "%d mappe er valgt." msgstr[1] "%d mapper er valgt." -#: ../../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." @@ -6651,7 +6675,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s og %s er merket for overføring." @@ -6689,7 +6713,7 @@ msgid "Selected file is still being edited" msgstr "Valgt fil er fortsatt åpen for redigering" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Valgt filter fungerer bare på lokale filer." @@ -6713,12 +6737,12 @@ msgid "Send custom command to the server otherwise not available" msgstr "Send selvvalgt kommando til tjeneren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Serienummer:" @@ -6726,21 +6750,21 @@ msgid "Server &Type:" msgstr "Tjener&type:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Tjeneren avsluttet ikke TLS-tilkoblinga skikkelig" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Tjeneren støtter ikke tegn som ikke er ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6749,15 +6773,15 @@ "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:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 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:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 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:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6766,7 +6790,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:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6774,11 +6798,11 @@ "Tjeneren krever kanskje at du har en konto. Prøv å velge en konto i " "tjeneroppsettet" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Tjeneren sendte en tom sti i retur." -#: ../../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." @@ -6786,13 +6810,13 @@ "Tjeneren sendte en ekstra innloggingsforespørsel. Du må bruke interaktiv " "innloggingstype." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6801,14 +6825,14 @@ "i stedet." #: ../../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: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 "Tjeneren sendte en uventet respons." @@ -6824,7 +6848,7 @@ msgid "Server&type:" msgstr "Tjener&type:" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Tjener-/lokal fil" @@ -6841,13 +6865,13 @@ msgid "Set &Priority" msgstr "Velg &prioritet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Bruk «%2$s» som tillatelsesoppsett for «%1$s»" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "«SetSocketBufferSize» sendte et kall uten sokkel" @@ -6867,7 +6891,7 @@ msgid "Show &welcome dialog..." msgstr "Vis &velkomstdialog …" -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Vil du se begge mappetrærne og fortsette sammenlikning?" @@ -6887,7 +6911,7 @@ msgid "Shows this help dialog" msgstr "Viser denne hjelpdialogen" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Slå av maskinen nå" @@ -6927,23 +6951,23 @@ msgid "Site Manager already open" msgstr "Tjeneroppsett er allerede åpent" -#: ../../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 "Tjeneren finnes ikke." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 msgid "Site path has to begin with 0 or 1." msgstr "Tjenerstien må begynne med 0 eller 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 "Tjenerstien er feilformatert." @@ -6962,7 +6986,7 @@ "tjeneroppsettet.\n" "Vil du legge til gjeldende tilkobling i tjeneroppsettet?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Størrelse" @@ -6981,43 +7005,43 @@ msgid "Skip file" msgstr "Hopp over fil" -#: ../../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 "Hopper over nedlasting av %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 "Hopper over opplasting av %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Sokkeladresse er utenfor adresseområdet" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Sokkel allerede tilkoblet" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Sokkel er avsluttet" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Sokkel ikke tilkoblet" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Sokkeltypen støttes ikke av aktuell adressefamilie" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Noen eksterne filer blir fremdeles redigert eller må lastes opp." @@ -7034,7 +7058,7 @@ msgid "Sort directories inline" msgstr "Sorter mapper sammen med filer" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Sorteringsrekkefølgen kan ikke endres når du sammenlikner mapper." @@ -7050,7 +7074,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Kildefil kan ikke være målfil" @@ -7062,7 +7086,7 @@ msgid "Source file:" msgstr "Kildefil:" -#: ../../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" @@ -7100,19 +7124,19 @@ msgid "Start with opened Site Manager" msgstr "Åpne tjeneroppsett ved oppstart" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Begynte å se etter oppdateringer %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Starter nedlasting av %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Starter opplasting av %s" @@ -7121,18 +7145,18 @@ msgid "Starts the local site in the given path" msgstr "Starter lokal filliste på valgt sti" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7144,7 +7168,7 @@ msgid "Stop recursive operation" msgstr "Stopp rekursiv handling" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Gate:" @@ -7160,11 +7184,11 @@ msgid "Summary of test results:" msgstr "Oppsummering av testresultater:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Sett i hvilemodus nå" -#: ../../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." @@ -7172,24 +7196,24 @@ "Symbolske lenker til filer påvirkes ikke av dette valget, da slike alltid " "slettes." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Synkronisert filbehandling" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synkronisert filbehandling er avslått." @@ -7203,8 +7227,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Syntaksfeil på kommandolinja" @@ -7216,11 +7240,11 @@ msgid "System details" msgstr "Systemdetaljer" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Du har flere åpne filer enn systemet tillater" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Systemets undersystem for nettverk er nede" @@ -7228,19 +7252,19 @@ msgid "T&oolbar" msgstr "&Verktøylinje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS-tilkobling etablert. Sender HTTP-forespørsel" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-tilkobling etablert. Venter på velkomstmelding …" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS-tilkobling etablert." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL utløpt" @@ -7252,15 +7276,15 @@ msgid "Target file:" msgstr "Målfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Målfila finnes allerede!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 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:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Midlertidig feil i navnoppslag" @@ -7268,7 +7292,7 @@ msgid "Test results" msgstr "Testresultater" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Tester fortsettelses-/resume-støtte på tjener" @@ -7293,25 +7317,25 @@ "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:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Adressen du skrev inn var: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "«ai_family»-medlem støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Klarte ikke å legge til bokmerke." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Klarte ikke å tømme bokmerker." @@ -7337,17 +7361,17 @@ "Selvvalgt tidsformat er ugyldig, eller inneholder formatspesifikasjoner som " "ikke støttes." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/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: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 "Fant ikke standard redigeringsprogram for tekstfiler." -#: ../../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 "Standard redigeringsprogram for tekstfiler er «%s»." @@ -7358,7 +7382,7 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "Aktuelt filternavn finnes allerede. Velg et annet navn." -#: ../../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 "Filetternavnet «%s» finnes allerede i lista" @@ -7374,7 +7398,7 @@ "Velg et nytt navn:" #: ../../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" @@ -7406,7 +7430,7 @@ msgstr "Klarte ikke å laste inn fila «%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" @@ -7416,7 +7440,7 @@ "Denne filtypen er ikke tilordnet et program." #: ../../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" @@ -7437,7 +7461,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:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7486,7 +7510,7 @@ 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:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Gratis FTP-løsning med åpen kildekode" @@ -7507,17 +7531,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Klarte ikke å opprette lokal mappe «%s»." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Lokal mappe «%s» finnes ikke." -#: ../../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" @@ -7528,7 +7552,7 @@ "Vil du slå av synkronisert filbehandling og fortsette med å endre lokal " "mappe?" -#: ../../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." @@ -7544,16 +7568,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Køen blir ikke lagret." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Ekstern mappe «%s» finnes ikke." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7593,11 +7617,11 @@ "Dette kan være skadelig for systemet.\n" "Er du sikker på at du vil fortsette?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Tjeneren ble ikke lagt til." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Tjeneren sendte en uventet eller ugjenkjennelig respons." @@ -7631,7 +7655,7 @@ "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:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "«servname»-parameteret støttes ikke for «ai_socktype»" @@ -7643,19 +7667,19 @@ "Oppsettet er importert. Du må starte FileZilla på nytt for at det skal tre i " "kraft." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Valgt adressefamilie støttes ikke" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Valgt nettverksnavn er ikke lenger tilgjengelig" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Datamaskinen slår seg av om kort tid, med mindre du avbryter." @@ -7667,7 +7691,7 @@ "Fila finnes allerede.\n" "Hva vil du gjøre?" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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?" @@ -7680,15 +7704,15 @@ msgid "Themes" msgstr "Tema" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Dette filtersettet kan ikke fjernes." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Du kan ikke gi et nytt navn til dette filtersettet." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7711,7 +7735,7 @@ "Denne veiviseren hjelper deg med å sette opp eventuelle rutere og/eller " "brannmurer du har, og tester deretter oppsettet." -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Tid" @@ -7724,26 +7748,26 @@ msgstr "Tids&avbrudd i sekunder:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Tidsavbrudd" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Tittel" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -7806,17 +7830,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Slår av og på visning av overføringskø" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "For lang header-linje" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "For mange videresendinger" -#: ../../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 "Sporing:" @@ -7845,17 +7869,17 @@ msgid "Transfer Settings" msgstr "Overføringsvalg" -#: ../../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 "Tilkoblingsforsøket avbrutt: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Overført data ble ødelagt." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Overfører" @@ -7864,8 +7888,7 @@ msgid "Transfers" msgstr "Overføringer" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Overføringer er ferdige" @@ -7877,11 +7900,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandle &følgende filtyper som ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Godkjenn endret vertsnøkkel:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Godkjenn ny vertsnøkkel:" @@ -7919,7 +7942,7 @@ msgid "U&pload" msgstr "Last o&pp" -#: ../../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 "O&pplastingsgrense:" @@ -7929,20 +7952,20 @@ msgstr "Bruk filtype-&tilordninger hvis tilgjengelig" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Bruk systemets &standard" +msgid "U&se system defaults for current language" +msgstr "&Bruk systemets standardverdier for gjeldende språk" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "BRUKER@&VERT" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Ikke tilordnet feilkode %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Enhet:" @@ -7951,11 +7974,11 @@ msgid "Unknown" msgstr "Ukjent" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Ukjent type FTP-mellomtjener. Kan derfor ikke lage innloggingssekvens." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Ukjent SOCKS protokollversjon: %d" @@ -7968,7 +7991,7 @@ msgid "Unknown host key" msgstr "Ukjent vertsnøkkel" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7981,8 +8004,8 @@ msgstr "" "Ukjent rotelement. Fila ser ikke ut til å ha blitt generert av FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -7990,7 +8013,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:598 +#: ../../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." @@ -7998,11 +8021,11 @@ "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:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Sertifikattypen støttes ikke" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Denne videresendinga støttes ikke" @@ -8072,12 +8095,12 @@ msgid "Use &custom editor:" msgstr "Bruk &selvvalgt redigeringsprogram:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Bruk &synkronisert filbehandling" @@ -8103,8 +8126,8 @@ msgstr "Bruk en tjener fra tjeneroppsettet" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Bruk systemets stan&dard" +msgid "Use system &defaults for current language" +msgstr "Bruk systemets &standardverdier for gjeldende språk" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8139,7 +8162,7 @@ msgid "User:" msgstr "Brukernavn:" -#: ../../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 "Brukernavn kan ikke være en rekke av mellomrom" @@ -8161,7 +8184,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Logg meldinger fra wxWidgets fortløpende" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Bekrefter sertifikat …" @@ -8169,7 +8192,7 @@ msgid "Very high" msgstr "Veldig høy" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "Visning av skjulte filer er slått på, men støttes ikke av tjeneren" @@ -8185,15 +8208,15 @@ msgid "W&rite" msgstr "&Skriv" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Venter" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Venter på filutforskertilkobling" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Venter på passord" @@ -8205,7 +8228,7 @@ msgid "Waiting to retry..." msgstr "Venter med å prøve på nytt …" -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Advarsel: ignorerer datatilkobling fra feil IP." @@ -8228,11 +8251,11 @@ msgid "Warning: Potential security breach!" msgstr "Advarsel: Potensielt sikkerhetsbrudd!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Velkommen til FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Nyheter" @@ -8240,7 +8263,7 @@ msgid "What's new:" msgstr "Nyheter:" -#: ../../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." @@ -8264,7 +8287,7 @@ msgid "Widescreen" msgstr "Widescreen" -#: ../../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 "Vil du at FileZilla skal huske passord?" @@ -8272,20 +8295,20 @@ msgid "Wr&ite" msgstr "S&kriv" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Ugyldig ekstern IP-adresse:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Ugyldige linjeendelser" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8297,7 +8320,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Du bruker nyeste versjon av 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 "Du kan finne igjen denne dialogboksen via hjelpemenyen." @@ -8335,12 +8358,12 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 msgid "" "You have selected more than 10 files for editing, do you really want to " "continue?" @@ -8348,7 +8371,7 @@ "Du har valgt å redigere flere enn ti filer samtidig. Er du sikker på at du " "vil fortsette?" -#: ../../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?" @@ -8356,7 +8379,7 @@ "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:414 +#: ../../locales/../src/interface/manual_transfer.cpp:415 #: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Du må skrive inn et vertsnavn." @@ -8365,30 +8388,30 @@ 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:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Du må angi en lokal mappe." -#: ../../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 "Du må angi en gyldig IP-adresse." +#: ../../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 må skrive inn en gyldig IPv4-adresse." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Du må angi en skrivbar lokal mappe." -#: ../../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 "Du må skrive inn et kontonavn" -#: ../../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 "Du må skrive inn et brukernavn" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8441,23 +8464,23 @@ "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:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Du må velge en lokal fil." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Du må velge en ekstern fil." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Du må velge en ekstern sti." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Du må angi en tjener." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8465,7 +8488,7 @@ "Du skal ikke ha problemer med å koble til andre tjenere. Filoverføring burde " "fungere." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Datamaskinen går i hvilemodus med mindre du avbryter." @@ -8490,7 +8513,7 @@ msgid "contains" msgstr "inneholder" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "selvvalgt" @@ -8512,19 +8535,19 @@ msgid "equals" msgstr "er lik" -#: ../../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: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:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-låsfil" -#: ../../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 " @@ -8533,15 +8556,15 @@ "Klarte ikke å starte fzputtygen.\n" "Kontroller at fila finnes i samme mappe som den kjørbare FileZilla-fila." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp hører til en annen versjon av FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "klarte ikke å starte 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 returnerte ingen sertifikater" @@ -8597,10 +8620,10 @@ msgid "owner writeable" msgstr "overskrivbar for eier" -#: ../../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: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 "ukjent" @@ -8621,6 +8644,30 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ 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å" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Nedlasting av flere urelaterte mapper samtidig støttes ikke ennå" + +#~ msgid "Downloading search results" +#~ msgstr "Laster ned søkeresultater" + +#~ msgid "U&se system defaults" +#~ msgstr "Bruk systemets &standard" + +#~ msgid "Use system &defaults" +#~ msgstr "Bruk systemets stan&dard" + #~ 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 " diff -Nru filezilla-3.14.1/locales/pl_PL.po filezilla-3.15.0.2/locales/pl_PL.po --- filezilla-3.14.1/locales/pl_PL.po 2015-09-09 14:05:02.000000000 +0000 +++ filezilla-3.15.0.2/locales/pl_PL.po 2016-02-05 08:54:46.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: FileZilla 3.10.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2015-09-05 01:11+0200\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" @@ -18,7 +18,7 @@ "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.4\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 @@ -51,9 +51,9 @@ msgstr[1] "%d katalogi" msgstr[2] "%d katalogów" -#: ../../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" @@ -63,9 +63,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" @@ -89,12 +89,12 @@ msgstr[1] "%d pliki. Całkowity rozmiar: Co najmniej %s" msgstr[2] "%d plików. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -137,7 +137,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certyfikat wygasł!" @@ -170,7 +170,7 @@ msgstr[1] "%s bajty" msgstr[2] "%s bajtów" -#: ../../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 " @@ -185,7 +185,7 @@ "Proszę pobrać FileZilla ponownie. Jeśli problem będzie się powtarzał, wyślij " "raport błędów." -#: ../../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 " @@ -203,7 +203,7 @@ "środowiskowej PATH.\n" "- Ustaw pełną ścieżkę do %s w zmiennej środowiskowej FZ_FZFSTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s z %d bitów" @@ -217,7 +217,7 @@ msgid "%w - Proxy password" msgstr "%w - Hasło proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Przerwij poprzednie połączenie i połącz się w bieżącej karcie" @@ -270,7 +270,7 @@ msgid "&Always use default editor" msgstr "&Zawsze używaj domyślnego edytora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Zawsze używaj wyboru dla nieskojarzonych plików" @@ -308,9 +308,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 @@ -323,8 +323,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" @@ -397,14 +397,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 "U&suń" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "U&suń symlinka" @@ -412,14 +412,14 @@ msgid "&Directory comparison" msgstr "&Porównywanie katalogów" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -445,7 +445,7 @@ msgid "&Display size in bytes" msgstr "&Pokazuj rozmiar w bajtach" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Nie zapisuj haseł (zalecane)" @@ -466,7 +466,7 @@ msgid "&Download" msgstr "&Pobierz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Pobierz do:" @@ -499,7 +499,7 @@ msgid "&Enable compression" msgstr "Włącz &kompresję" -#: ../../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 "&Włącz limity prędkości" @@ -516,7 +516,7 @@ msgid "&Enter custom command..." msgstr "&Wprowadź dowolne polecenie..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Nawiąż połączenie w &nowej karcie" @@ -569,7 +569,7 @@ msgid "&Finish editing and delete local file" msgstr "&Zakończ edycję i skasuj plik lokalny" -#: ../../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" @@ -577,7 +577,7 @@ "&Omijaj zdalne ścieżki, pobierz wszystkie zawarte pliki bezpośrednio do " "katalogu docelowego" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "Ś&ledź symlinka, usuń zawartość katalogu docelowego" @@ -640,7 +640,7 @@ msgid "&Install new version" msgstr "Za&instaluj nową wersję" -#: ../../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 "" "&Zachowaj strukturę zdalnej ścieżki w stosunku do głównego wyszukiwania" @@ -666,7 +666,7 @@ msgstr "D&rzewo lokalnych katalogów" #: ../../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 "Katalog &lokalny:" @@ -730,11 +730,11 @@ msgid "&New Site" msgstr "&Nowy adres" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Dostępna jest nowa wersja!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Dalej >" @@ -757,7 +757,7 @@ msgstr "Wartość numeryczna:" #: ../../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 "&OK" @@ -834,12 +834,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Zapamiętaj hasło dla tej sesji FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Zdalny katalog:" @@ -860,7 +860,7 @@ msgstr "&Usuń zaznaczone" #: ../../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 @@ -921,7 +921,7 @@ msgid "&Save as..." msgstr "&Zapisz jako..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Szukaj" @@ -990,7 +990,7 @@ msgid "&Speed limits" msgstr "&Limity prędkości" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Natychmiast rozpocznij transfer" @@ -1002,7 +1002,7 @@ msgid "&TLS Ciphers" msgstr "Szyfrowanie &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Testuj" @@ -1045,7 +1045,7 @@ msgid "&Uploads:" msgstr "&Wysyłania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Użyj własnego programu" @@ -1079,7 +1079,7 @@ msgid "&Username:" msgstr "&Nazwa użytkownika:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "Wersja %s" @@ -1123,12 +1123,12 @@ msgid "'%s' is not a directory." msgstr "'%s' nie jest katalogiem." -#: ../../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 "Typ logowania 'Konto' nieobsługiwany przez wybrany protokół" -#: ../../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." @@ -1144,7 +1144,7 @@ "Typy logowania 'Normalny' i 'Konto' są niedostępne. Zmieniono opcję na " "'Pytaj o hasło'." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1203,8 +1203,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(przykład: %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 @@ -1263,7 +1263,7 @@ msgid "64-bit system" msgstr "64-bitowy system" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Wstecz" @@ -1284,7 +1284,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 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." @@ -1314,7 +1314,7 @@ "Plik o tej nazwie jest wciąż edytowany. Proszę go zamknąć i spróbować " "ponownie." -#: ../../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 " @@ -1333,7 +1333,7 @@ msgid "A new version of FileZilla is available:" msgstr "Dostępna jest nowa wersja FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1350,7 +1350,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: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?" @@ -1403,11 +1403,11 @@ #: ../../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: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" @@ -1433,7 +1433,7 @@ msgid "Active mode" msgstr "Tryb aktywny" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1441,7 +1441,7 @@ "Test trybu aktywnego FTP nie powiódł się. FileZilla nie zna poprawnego " "zewnętrznego adresu IP." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1449,7 +1449,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:595 +#: ../../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 " @@ -1462,7 +1462,7 @@ msgid "Active mode IP" msgstr "Aktywny tryb IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Dodaj pliki tylko do &kolejki" @@ -1481,7 +1481,7 @@ msgid "Add to queue" msgstr "Dodaj do kolejki" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Typ adresu nieobsługiwany" @@ -1503,7 +1503,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Zawsze wykonuj tę akcję" @@ -1511,7 +1511,7 @@ msgid "Algorithm:" msgstr "Algorytm:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "Wszystkie pliki zostały wysłane pomyślnie" @@ -1519,7 +1519,7 @@ 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:2946 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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." @@ -1538,11 +1538,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Pozwól na powrót do innego trybu transferu po niepowodzeniu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Już połączono" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nazwa alternatywna:" @@ -1571,7 +1571,7 @@ "website:" msgstr "Ewentualnie, możesz pobrać najnowszą wersję ze strony FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1580,7 +1580,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:1821 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1589,7 +1589,7 @@ "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: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." @@ -1598,16 +1598,16 @@ "przeciągany." #: ../../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/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 "Anonimowy" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "Trwa już inna zdalna operacja, nie można teraz zmieniać katalogu." @@ -1616,11 +1616,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Wszelkie zmiany dokonane w filtrach nie zostaną zapisane." @@ -1644,7 +1644,7 @@ msgid "Archive" msgstr "Archiwum" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Przepełnienie buforu argumentu" @@ -1662,7 +1662,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Pytaj o hasło" @@ -1674,7 +1674,7 @@ 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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Zadawanie pytań na forum FileZilli" @@ -1694,7 +1694,7 @@ msgid "Attribute" msgstr "Atrybut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Uwierzytelnianie nie powiodło się." @@ -1723,11 +1723,11 @@ msgid "B&ypass proxy" msgstr "&Obejście proxy" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Błędne opisanie pliku" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Podstawowe instrukcje użytkowania" @@ -1740,7 +1740,7 @@ msgid "Being edited" msgstr "W edycji" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Uważaj! Certyfikat został unieważniony" @@ -1758,11 +1758,11 @@ msgid "Bookmark" msgstr "Zakładka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Zakładka:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Zakładki" @@ -1778,7 +1778,7 @@ msgid "Build information" msgstr "Informacje o kompilacji" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Kategoria biznes:" @@ -1817,22 +1817,22 @@ msgid "CPU features:" msgstr "Cechy CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Obliczanie przesunięcia czasu serwera..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Nie można odczytać pliku" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:716 msgid "Can't write data to file." msgstr "Nie można zapisać danych do pliku." -#: ../../locales/../src/engine/transfersocket.cpp:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:718 #, c-format msgid "Can't write data to file: %s" msgstr "Nie można zapisać danych do pliku: %s" @@ -1850,13 +1850,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 "Anuluj" @@ -1876,11 +1876,11 @@ "Nie można uzyskać dostępu do '%s', brak włożonego nośnika, bądź napęd nie " "jest gotowy." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Nie można dodać serwera do Menedżera Stron" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Nie można przydzielić żądanego adresu" @@ -1906,20 +1906,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 "Nie można edytować pliku" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 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:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Nie można edytować pliku, zdalna ścieżka nieznana." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1936,11 +1936,11 @@ msgid "Cannot load key file" msgstr "Nie można załadować pliku klucza" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Nie można zapamiętać hasła" @@ -1949,20 +1949,20 @@ msgid "Cannot rename entry" msgstr "Nie można zmienić nazwy wpisu" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Nie można zmienić nazwy pliku" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Nie można zapisać zbioru filtrów" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Nie można wybrać filtra" @@ -2030,7 +2030,7 @@ msgstr "" "Zmiana ustawień pliku dziennika wymaga ponownego uruchomienia FileZilla." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Problem z kodowaniem znaków" @@ -2058,14 +2058,14 @@ msgid "Check for updates failed" msgstr "Sprawdzenie dostępności aktualizacji nieudane" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 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:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2073,7 +2073,7 @@ "Sprawdź swoje dane logowania. Podana nazwa użytkownika rozpoczyna lub kończy " "się spacją." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Sprawdzanie zewnętrznego adresu IP" @@ -2081,12 +2081,12 @@ msgid "Checking for updates..." msgstr "Sprawdzanie aktualizacji..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Suma kontrolna zgodna w pliku %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Suma kontrolna niezgodna w pliku %s\n" @@ -2101,11 +2101,11 @@ #: ../../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 "Wybierz katalog lokalny" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Fragment danych niepoprawnie zakończony" @@ -2143,7 +2143,7 @@ msgid "Clear quickconnect bar" msgstr "Wyczyść pasek szybkiego łączenia" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Kliknij na Zakończ, aby zapisać swoją konfigurację." @@ -2160,8 +2160,8 @@ msgstr "Zamknij wszystkie inne karty" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Zamknij FileZilla" @@ -2190,13 +2190,13 @@ msgstr "" "Polecenie i jego argumenty powinny być poprawnie umieszczone w cudzysłowach." -#: ../../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 "Wykonanie polecenia nie powiodło się" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Polecenie nieobsługiwane" @@ -2204,9 +2204,9 @@ msgid "Command not supported by this protocol" msgstr "Polecenie nieobsługiwane przez ten protokół" -#: ../../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 "Polecenie:" @@ -2214,12 +2214,12 @@ msgid "Comment" msgstr "Komentarz" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Aktualna nazwa:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Połączenie zniekształcone przez router lub zaporę" @@ -2266,7 +2266,7 @@ msgstr "Jednoczesne transfery" #: ../../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 "Warunki &rozróżniają małe i duże litery" @@ -2282,24 +2282,24 @@ msgid "Configure port range" msgstr "Konfiguracja zakresu portów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Konfiguracja FileZilli i Twojej sieci" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Potwierdź usunięcie" -#: ../../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 "Wymagane potwierdzenie" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulacje, wygląda na to, że Twoja konfiguracja działa." @@ -2307,6 +2307,11 @@ msgid "Connect bypassing proxy settings" msgstr "Połącz z pominięciem ustawień serwera proxy" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "Żądanie proxy nie powiodło się: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Połącz w aktywnej karcie" @@ -2319,29 +2324,29 @@ msgid "Connect to specified Site Manager site" msgstr "Połącz do podanego serwera z Menedżera Stron" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "Połączono" -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Łączenie" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Łączenie z %s poprzez proxy %s" -#: ../../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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Łączenie z %s..." @@ -2350,81 +2355,86 @@ msgid "Connection" msgstr "Połączenie" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Połączenie zamknięte" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Nieudana próba połączenia" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Nieudana próba połączenia z \"%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 "Próba połączenia przerwana przez użytkownika" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Przekroczony czas oczekiwania na połączenie" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Połączenie zamknięte" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Połączenie zakończone przez serwer" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Połączenie nawiązane, inicjowanie TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Połączenie nawiązane, wysyłanie żądania HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Połączenie zerwane" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Połączenie niedozwolone przez zbiór reguł" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Połączenie odrzucone" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Połączenie odmówione przez serwer" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Połączenie zresetowane przez sieć" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Użytkownik resetuje połączenie" -#: ../../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" @@ -2432,39 +2442,39 @@ msgstr[1] "Połączenie zakończone po %d sekundach nieaktywności" msgstr[2] "Połączenie zakończone po %d sekundach nieaktywności" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Przekroczony czas oczekiwania na połączenie." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Połączenie z serwerem przerwane." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "" "Połączenie z proxy nawiązanie, wykonywanie wymiany danych powitalnych..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Połączenie z serwerem zostało przedwcześnie zakończone." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Połączenie z serwerem testowym nie powiodło się." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Przekształć plik klucza" #: ../../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 "Kopiowanie (%d) z %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 "Kopiowanie z %s" @@ -2474,7 +2484,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "Kopiuj adresy wybranych przedmiotów do schowka." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Nie można nawiązać połączenia: %s" @@ -2484,30 +2494,30 @@ msgid "Could not add connection to Site Manager" msgstr "Nie można dodać połączenia do Menedżera Stron" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Nie można ukończyć operacji" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Nie można połączyć się z serwerem" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Nie można połączyć się z serwerem: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Nie można przetworzyć polecenia na kodowanie serwera" -#: ../../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 "Nie można przekształcić prywatnego klucza" -#: ../../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 "Nie można skopiować adresów" @@ -2515,17 +2525,17 @@ msgid "Could not copy data" msgstr "Nie można skopiować danych" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Nie można stworzyć pliku lokalnego %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Nie można stworzyć śledzenia mutex'u: %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" @@ -2536,11 +2546,11 @@ "Rozszerzenie powłoki nie jest poprawnie zainstalowane lub pliki nie zostały " "przeciągnięte do okna Explorera." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Nie można nawiązać połączenia z serwerem" -#: ../../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 " @@ -2552,11 +2562,11 @@ "datadir <ścieżka>' lub przez ustawienie wartości zmiennej środowiskowej " "FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Nie można wygenerować własnej sekwencji logowania." -#: ../../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" @@ -2564,7 +2574,7 @@ "Nie można otrzymać nazwy wydawcy certyfikatu, gnutls_x509_get_issuer_dn nie " "powiodło się" -#: ../../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" @@ -2572,27 +2582,32 @@ "Nie można otrzymać nazwy podmiotu certyfikatu, gnutls_x509_get_dn nie " "powiodło się" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Nie można uzyskać pełnej ścieżki zdalnej." -#: ../../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 "Nie można pobrać odpowiedzi z 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 "Nie można znaleźć katalogu tymczasowego do zapisania w nim pliku." -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, fuzzy, 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" @@ -2615,11 +2630,11 @@ msgid "Could not load key file" msgstr "Nie można załadować pliku klucza" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Nie można załadować prywatnego klucza" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2630,7 +2645,7 @@ "'%s'.\n" "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?" -#: ../../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 " @@ -2641,7 +2656,7 @@ "'%s'.\n" "Synchronizowane przeglądanie zostało wyłączone." -#: ../../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 " @@ -2653,14 +2668,14 @@ "Synchronizowane przeglądanie zostało wyłączone." #: ../../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 "Nie można otworzyć schowka" -#: ../../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 "Nie można otworzyć pliku dziennika: %s" @@ -2673,42 +2688,52 @@ msgid "Could not parse server address:" msgstr "Nie można zanalizować adresu serwera:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Nie można czytać z gniazda: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Nie można czytać z gniazda: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Nie można odczytać elementu serwera." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Nie można połączyć się z serwerem" + +#: ../../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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Nie można przejść na koniec pliku" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Nie można wysłać polecenia do fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Nie można utworzyć wątku IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, 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:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Nie można rozpocząć transferu" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2729,7 +2754,7 @@ msgstr "" "Nie można zapisać \"%s\", globalne zakładki nie mogły zostać zapisana: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2738,9 +2763,9 @@ "Nie można zapisać \"%s\", kolejka nie mogła zostać zapisana.\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 "" @@ -2751,28 +2776,28 @@ msgid "Could not write \"%s\":" msgstr "Nie można zapisać \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Nie można zapisać pliku klucza: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Nie można zapisać do pliku lokalnego" -#: ../../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 "Nie można zapisać do pliku dziennika: %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 "Nie można zapisać do gniazda: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "Kraj:" @@ -2780,11 +2805,11 @@ msgid "Crea&te new file" msgstr "Utwórz &nowy plik" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Utwórz lokalny &katalog i otwórz go" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Utwórz zdalny &katalog i otwórz go" @@ -2813,45 +2838,45 @@ msgid "Create director&y and enter it" msgstr "Utwórz &katalog i otwórz go" -#: ../../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 "Utwórz katalog" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Utwórz pusty plik" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Tworzenie katalogu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Tworzenie katalogu '%s'..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Błąd krytyczny" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Błąd krytyczny:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Błąd krytyczny transferu pliku" -#: ../../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 "Błąd krytyczny transferu pliku po przeniesieniu %s w %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" @@ -2882,7 +2907,7 @@ msgid "Cus&tom" msgstr "Włas&ne" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Własny zestaw filtrów" @@ -2909,6 +2934,10 @@ msgid "D&elete" msgstr "&Usuń" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Poró&wnywanie katalogów" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Deaktywuj wszystkie" @@ -2922,7 +2951,7 @@ msgstr "Akcja &dwukrotnego kliknięcia na katalogach:" #: ../../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 "&Duplikuj" @@ -2938,8 +2967,8 @@ msgid "Data" msgstr "Dane" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Gniazdo danych zamknięte zbyt wcześnie." @@ -3063,19 +3092,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Usuwanie plików (%u) z \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Usuwanie katalogów" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Usuwanie kilku niepowiązanych katalogów nie jest jeszcze obsługiwane" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Usuwanie linka symbolicznego" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Pulpit" @@ -3097,7 +3118,7 @@ msgid "Dire&ctories" msgstr "&Katalogi" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Kierunek" @@ -3105,13 +3126,13 @@ msgid "Directory" msgstr "Katalog" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Porównywanie katalogów" @@ -3125,11 +3146,11 @@ "Katalog zawierający plik dziennika nie istnieje lub nazwa pliku jest " "nieprawidłowa." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Listowanie katalogów przerwane przez użytkownika" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Listowanie katalogów nieudane" @@ -3137,12 +3158,12 @@ msgid "Directory listing filters" msgstr "Filtry listy katalogów" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Listowanie katalogów w \"%s\" zakończone pomyślnie" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Listowanie katalogów zakończone pomyślnie" @@ -3150,13 +3171,13 @@ msgid "Disa&ble all" msgstr "Deaktywuj wszystkie" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3168,23 +3189,23 @@ msgid "Disconnect from server" msgstr "Odłącz od serwera" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Odłączono od serwera" -#: ../../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 "Odłączono od serwera: %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 "Odłączanie od poprzedniego serwera" @@ -3210,8 +3231,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Czy na pewno chcesz zamknąć FileZilla?" @@ -3234,7 +3255,7 @@ 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:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Czy na pewno chcesz wysłać '%s' do serwera?" @@ -3243,7 +3264,7 @@ msgid "Do you want to reopen this file?" msgstr "Chcesz ponownie otworzyć ten plik?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentacja" @@ -3263,7 +3284,7 @@ msgid "Download" msgstr "Pobieranie" -#: ../../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 "Limit pobierania:" @@ -3277,9 +3298,9 @@ msgid "Download limit: none" msgstr "Limit pobierania: brak" -#: ../../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 "Pobierz wyniki wyszukiwania" @@ -3291,7 +3312,7 @@ msgid "Download selected files and directories" msgstr "Pobierz zaznaczone pliki i katalogi" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3304,26 +3325,18 @@ msgid "Downloading" msgstr "Pobieranie" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Pobieranie %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Pobieranie kilku niepowiązanych katalogów nie jest jeszcze obsługiwane" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Pobieranie wyników wyszukiwania" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Pobieranie aktualizacji..." -#: ../../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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3333,9 +3346,9 @@ "Operacja drag&drop pomiędzy różnymi instancjami FileZilla nie została " "jeszcze zaimplementowana." -#: ../../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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3370,7 +3383,7 @@ msgid "E&xport..." msgstr "&Eksportuj..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "E-Mail:" msgstr "E-mail:" @@ -3388,16 +3401,16 @@ msgstr "" "Edytuj plik za pomocą zdefiniowanego edytora i wyślij zmiany na serwer." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Edytowanie katalogów nie jest wspierane" -#: ../../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 "Edytowanie nie powiodło się" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Edytowanie wyników wyszukiwania" @@ -3405,7 +3418,7 @@ msgid "Email:" msgstr "E-mail:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Puste polecenie" @@ -3413,7 +3426,7 @@ msgid "Empty command." msgstr "Puste polecenie." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Pusta lista katalogów" @@ -3421,6 +3434,12 @@ 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." @@ -3459,7 +3478,7 @@ msgid "Encryption details" msgstr "Szczegóły szyfrowania" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Zakończyć porównywanie i zmienić porządek sortowania?" @@ -3467,15 +3486,15 @@ msgid "Enter &custom command..." msgstr "&Wprowadź dowolne polecenie..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Wpisz 0 dla nieograniczonej prędkości." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Wprowadź polecenie" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Wprowadź dowolne polecenie" @@ -3489,11 +3508,11 @@ msgid "Enter filter name" msgstr "Wprowadź nazwę filtra" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Wprowadź nazwę zestawu filtrów" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Wprowadź nową nazwę zestawu filtrów" @@ -3533,7 +3552,7 @@ "ftps:// dla FTP przez TLS (domniemany) i\n" "ftpes:// dla FTP przez TLS (bezpośredni)." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3563,7 +3582,7 @@ msgid "Error importing" msgstr "Błąd importowania" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "Błąd przy wczytywaniu kolejki" @@ -3572,50 +3591,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/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: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:939 msgid "Error loading xml file" msgstr "Błąd ładowania pliku XML" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" msgstr "Błąd przy zapisywaniu kolejki" -#: ../../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 "Błąd podczas uruchomienia 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:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 +#: ../../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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Błąd zapisywania pliku 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 "Błąd:" @@ -3707,24 +3726,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP przez domniemany 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/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 "Nie udało się zmienić katalogu" -#: ../../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 "Nie udało się zmienić języka" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Nie udało się skopiować lub przenieść lokalizacji" @@ -3732,31 +3751,31 @@ msgid "Failed to create backup copy of xml file" msgstr "Nie udało się stworzyć kopii zapasowej pliku XML" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../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/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Nie udało się pobrać ścieżki do katalogu 'Moje dokumenty'" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Nie udało się pobrać ścieżki do pulpitu" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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 " @@ -3766,81 +3785,86 @@ msgid "Failed to initialize FTP engine" msgstr "Nie udało się zainicjować silnika FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Nie udało się zainicjalizować TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Nie udało się zainicjować silnika FTP" + #: ../../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:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Nie powiodło sie załadowanie prywatnego klucza: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, 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:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Nie udało się otworzyć \"%s\" do odczytu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Nie udało się otworzyć \"%s\" do zapisu" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Nie można zanalizować zwróconej ścieżki." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Nie udało się otrzymać danych" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Nie udało się otrzymać listy katalogów" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../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:3779 +#: ../../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:3800 +#: ../../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:706 +#: ../../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:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Nie udało się uzyskać zewnętrznego adresu IP." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Nie udało się wysłać polecenia." -#: ../../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 "" "Nie udało się ustawić języka na %s (%s), nastąpi użycie domyślnego języka " "systemu" -#: ../../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)." @@ -3848,28 +3872,28 @@ "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:119 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, 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: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 "" "Nie udało się ustawić języka na %s, nastąpi użycie domyślnego języka systemu" -#: ../../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 "" "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:116 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" @@ -3879,11 +3903,11 @@ msgid "Failed to validate settings" msgstr "Nie udało się sprawdzić ustawień" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Nie udało się zweryfikować certyfikatu drugiej strony" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Nie udało się zapisać do pliku %s" @@ -3916,7 +3940,7 @@ msgid "File Types" msgstr "Typy plików" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Plik nie opisuje gniazda" @@ -3928,7 +3952,7 @@ msgid "File editing" msgstr "Edycja pliku" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Plik istnieje" @@ -3945,8 +3969,8 @@ msgstr "Listy plików" #: ../../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 "Nie znaleziono pliku" @@ -3955,38 +3979,38 @@ msgid "File search" msgstr "Wyszukiwanie plików" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Transfer plików przerwany przez użytkownika" -#: ../../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 "Transfer plików przerwany przez użytkownika po przeniesieniu %s w %s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Transfer plików nie powiódł się" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Transfer plików pominięty" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Transfer plików zakończony pomyślnie" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Transfer plików jeszcze trwa." @@ -3998,7 +4022,7 @@ msgid "File would transfer with binary data type." msgstr "Plik byłby transferowany z binarnym typem danych." -#: ../../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" @@ -4010,11 +4034,11 @@ "properly." msgstr "FileZilla może teraz przetestować poprawność konfiguracji." -#: ../../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 już jest podłączona do serwera." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -4029,7 +4053,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 @@ -4040,13 +4064,13 @@ msgid "Filename &filters..." msgstr "&Filtry nazw plików..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "Nie można utworzyć nazwy pliku dla katalogu %s i nazwy pliku %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Nieprawidłowa nazwa pliku" @@ -4077,7 +4101,7 @@ msgstr "Pliki obecnie edytowane" #: ../../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" @@ -4087,7 +4111,7 @@ msgid "Filesize format" msgstr "Format rozmiaru pliku" -#: ../../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" @@ -4125,8 +4149,8 @@ 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: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 "Zbiór filtrów już istnieje" @@ -4140,11 +4164,11 @@ msgid "Filter validation failed" msgstr "Walidacja filtra nieudana" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Znajdź &pliki" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Znajdź &katalogi" @@ -4161,7 +4185,7 @@ msgid "Fingerprint:" msgstr "Hash:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Kreator konfiguracji zapory i routera" @@ -4195,7 +4219,7 @@ msgid "Force showing &hidden files" msgstr "Wymuś wyświetlanie &ukrytych plików" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Wymuś wyświetlanie ukrytych plików" @@ -4210,12 +4234,12 @@ "argumenty." #. @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 "Znaleziono nowe %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Dalsza dokumentacja" @@ -4223,7 +4247,7 @@ msgid "General" msgstr "Ogólne" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Awaria serwera SOCKS" @@ -4236,12 +4260,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Uzyskiwanie pomocy" -#: ../../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 "Podana nazwa zestawu filtrów już istnieje, nadpisać zestaw filtrów?" @@ -4249,22 +4273,22 @@ msgid "Global bookmarks" msgstr "Globalne zakładki" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Błąd GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Błąd GnuTLS %d w %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Błąd GnuTLS %d w %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Błąd GnuTLS %d: %s" @@ -4294,17 +4318,17 @@ msgstr "Ukryty" #: ../../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 "Wysoka" -#: ../../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 "Najwyższy" -#: ../../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 "Najwyższy dostępny port musi być między 1024 a 65535." @@ -4319,7 +4343,7 @@ msgid "Homepage:" msgstr "Strona domowa:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Host jest wyłączony" @@ -4335,7 +4359,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Host rozpoczyna się od '[', jednak brakuje nawiasu zamykającego." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Host nieosiągalny" @@ -4354,7 +4378,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (przykład: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Adresy IPv6 nie są wspierane z proxy SOCKS4" @@ -4400,7 +4424,7 @@ "Jeżeli zmiana klucza nie była oczekiwana, skontaktuj się z administratorem " "serwera." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4408,7 +4432,7 @@ "Jeśli ten problem nie zniknie, jakiś router i/lub zapora blokuje program " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4425,7 +4449,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: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." @@ -4433,7 +4457,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4441,7 +4465,7 @@ "Jeśli ten problem nie zniknie, skontaktuj się z producentem Twojego routera " "lub zapory." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Jeśli ten problem nie zniknie, skontaktuj się z producentem Twojego routera." @@ -4477,7 +4501,7 @@ "Jeśli klikniesz przetestuj, FileZilla połączy się z probe.filezilla-project." "org i wykona kilka prostych testów." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Jeśli zamkniesz program FileZilla, Twoje zmiany zostaną utracone." @@ -4502,7 +4526,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:584 +#: ../../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 " @@ -4536,7 +4560,7 @@ "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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4596,7 +4620,7 @@ "serwer o port i łączy się z podanym portem. Do tego nie potrzeba wiele " "konfiguracji." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4604,7 +4628,7 @@ "Niekompletny łańcuch, górny certyfikat nie jest samopodpisanym certyfikatem " "urzędu certyfikacji" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Nieprawidłowe hasło" @@ -4616,17 +4640,21 @@ "Informacje o najnowszej wersji FileZilla nie mogły zostać pobrane. Proszę " "spróbować ponownie później." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Inicjowanie TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Niebezpieczny algorytm!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktywny" @@ -4634,29 +4662,29 @@ msgid "Interface" msgstr "Interfejs" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Przerwane na sygnał" -#: ../../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 "Przerwane przez użytkownika" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Nieprawidłowy znacznik Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Nieprawidłowa odpowiedź HTTP" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Nieprawidłowo podany argument" -#: ../../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." @@ -4664,18 +4692,19 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Nieprawidłowy rozmiar fragmentu" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Otrzymano nieprawidłowe dane" -#: ../../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 "Nieprawidłowa data" @@ -4715,38 +4744,38 @@ "ftps:// dla FTP przez TLS (domniemany) i\n" "ftpes:// dla FTP przez TLS (bezpośredni)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Nieprawidłowe wyrażenie regularne w warunkach wyszukiwania." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Nieprawidłowy kod odpowiedzi" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Nieprawidłowe warunki wyszukiwania: %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 "Nieprawidłowa ścieżka adresu" @@ -4758,23 +4787,23 @@ msgid "Invalid username given." msgstr "Nieprawidłowa nazwa użytkownika." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Nieprawidłowa wartość dla ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Nieprawidłowa wartość dla wskazówek" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "Jurysdykcja kraju:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Jurysdykcja regionalna:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Jurysdykcja państwa lub prowincji:" @@ -4782,7 +4811,7 @@ msgid "Keep directories on top" msgstr "Katalogi na wierzchu" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4816,11 +4845,11 @@ msgid "Language" msgstr "Język" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Język zmieniony" -#: ../../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" @@ -4850,7 +4879,7 @@ msgid "Limit:" msgstr "Limit:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Długość linii przekroczona" @@ -4858,13 +4887,14 @@ msgid "Linked against" msgstr "Związana z" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Gniazdo nasłuchujące zamknięte" -#: ../../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 "Lista:" @@ -4877,11 +4907,11 @@ msgid "Local" msgstr "Lokalny" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Adres lokalny w użyciu" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Lokalny punkt końcowy został zamknięty" @@ -4889,21 +4919,21 @@ msgid "Local file" msgstr "Plik lokalny" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Plik lokalny nie istnieje." -#: ../../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 "Plik lokalny: %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 "Plik lokalny jest katalogiem zamiast normalnym plikiem." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Plik lokalny posiada nieprawidłową nazwę." @@ -4915,7 +4945,7 @@ msgid "Local site:" msgstr "Adres lokalny:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Lokalizacja:" @@ -4928,7 +4958,7 @@ msgid "Logging" msgstr "Dziennik" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4936,7 +4966,7 @@ "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." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4944,7 +4974,7 @@ "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:835 +#: ../../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 " @@ -4963,17 +4993,17 @@ "Typ loginu musi używany być wraz z adresem typu FTP. Argumentem musi być " "'%s' lub '%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 "Niski" -#: ../../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 "Najniższy" -#: ../../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ższy dostępny port musi być liczbą między 1024 a 65535." @@ -4987,45 +5017,45 @@ "Upewnij się, że plik jest dostępny i jest poprawnie sformatowanym dokumentem " "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 "Zniekształcony fragment danych: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Zniekształcony nagłówek: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Ręczny transfer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "pasować do wszystkich z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "pasować do jakiegokolwiek z następujących" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "nie może pasować do żadnego z następujących" @@ -5033,12 +5063,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Maksymalna liczba jednoczesnych transferów:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Alokacja pamięci nieudana" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Dziennik wiadomości" @@ -5046,7 +5076,7 @@ msgid "Message log position" msgstr "Pozycja dziennika wiadomości" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Wiadomość za duża" @@ -5066,15 +5096,15 @@ msgid "Move &up" msgstr "Przesuń w &górę" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Mój komputer" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Moje dokumenty" -#: ../../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" @@ -5095,7 +5125,7 @@ msgstr "Nazwa już istnieje" #: ../../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 "Nazwa zakładki już istnieje" @@ -5111,7 +5141,7 @@ msgid "Need to enter filter name" msgstr "Należy wpisać nazwę filtra" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Należy wprowadzić prawidłową ścieżkę zdalną" @@ -5119,11 +5149,11 @@ msgid "Need to specify a character encoding" msgstr "Należy wybrać rodzaj kodowania znaków" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 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:1080 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5131,8 +5161,8 @@ "Host połączenia nie posiada żadnych adresów połączeń z żądanej rodziny " "adresów" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Sieć nieosiągalna" @@ -5148,7 +5178,7 @@ msgid "New &tab" msgstr "Nowa &karta" -#: ../../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 "Nowa &zakładka" @@ -5167,14 +5197,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 "Nowa zakładka" -#: ../../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 "Nowy katalog" @@ -5191,9 +5221,9 @@ msgid "New folder" msgstr "Nowy katalog" -#: ../../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 "Nowy adres" @@ -5201,11 +5231,11 @@ msgid "Next to the transfer queue" msgstr "Następny po kolejce transferów" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Nie" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Żaden program nie jest skojarzony z nazwą serwera" @@ -5213,11 +5243,11 @@ msgid "No category to export selected" msgstr "Nie zaznaczono żadnej kategorii do eksportowania" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "Nie podano polecenia, przerywanie." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Brak ustawionego zewnętrznego adresu IP, próbowanie domyślnego." @@ -5239,26 +5269,26 @@ msgid "No images available" msgstr "Brak dostępnych obrazków" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "Brak plików w kolejce!" -#: ../../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 "Nie podano nazwy zbioru filtrów." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Żaden program nie jest skojarzony z typem pliku" -#: ../../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 "" "Nie został skojarzony żaden program do edycji plików z rozszerzeniem '%s'." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Brak trasy do hosta" @@ -5266,11 +5296,11 @@ msgid "No search results" msgstr "Brak wyników wyszukiwania" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Brak dostępnych stron" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Metoda autoryzacji SOCKS5 jest nieobsługiwana" @@ -5280,7 +5310,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 "Brak" @@ -5288,18 +5318,18 @@ msgid "None selected yet" msgstr "Jeszcze nic nie wybrano" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Normalne" @@ -5309,16 +5339,16 @@ msgid "Not all items could be requeued for transfer." msgstr "Nie wszystkie elementy mogą zostać zażądane do transferu" -#: ../../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 "Nie połączono" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Nie połączono z żadnym serwerem" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Nie połączono z jakimkolwiek serwerem." @@ -5326,11 +5356,11 @@ msgid "Not connected." msgstr "Nie połączono." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Nie zainicjalizowane, trzeba wywołać WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5373,13 +5403,13 @@ #: ../../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" @@ -5397,7 +5427,7 @@ "Na następujących stronach zostanie skonfigurowany wybrany tryb transferu " "oraz opcja powrotu, jeśli została wybrana." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Raz" @@ -5445,8 +5475,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 "Otwarcie nie powiodło się" @@ -5469,19 +5499,19 @@ msgid "Operating System:" msgstr "System operacyjny:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Operacja jest już w toku" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Operacja w toku" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Operacja nieobsługiwana" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Organizacja:" @@ -5489,16 +5519,16 @@ msgid "Other SFTP options" msgstr "Pozostałe opcje SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Inny błąd systemowy" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Inne:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Brak pamięci" @@ -5546,7 +5576,7 @@ 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:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Własny rodzaj kompilacji: %s\n" @@ -5573,7 +5603,7 @@ msgid "P&roxy host:" msgstr "Hos&t proxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "Polecenie PORT zniekształcone przez router lub zaporę." @@ -5581,11 +5611,11 @@ msgid "Pa&ssive (recommended)" msgstr "&Pasywny (zalecany)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parametr nie jest prawidłowym adresem" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Parsowanie %d bajtów z informacji o wersji.\n" @@ -5605,13 +5635,13 @@ msgid "Passive mode" msgstr "Tryb pasywny" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "Tryb pasywny został ustawiony jako domyślny tryb transferu." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Wymagane hasło" @@ -5620,13 +5650,13 @@ msgid "Path" msgstr "Ścieżka" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Nie można utworzyć ścieżki dla katalogu %s i podkatalogu %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Nie znaleziono ścieżki:" @@ -5645,8 +5675,8 @@ msgid "Permission" msgstr "Prawo dostępu" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Odmówiono dostępu" @@ -5659,7 +5689,7 @@ msgid "Platform:" msgstr "Platforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5675,11 +5705,11 @@ "Skonfiguruj wszelkie zapory i routery, aby FileZilla mogła nawiązać " "połączenia wychodzące do dowolnego portu." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5715,7 +5745,7 @@ msgid "Please enter a new name for the copied filter." msgstr "Podaj nową nazwę dla skopiowanego filtra." -#: ../../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 "Podaj nową nazwę dla zestawu filtrów \"%s\"" @@ -5745,7 +5775,7 @@ msgid "Please enter a password for this server:" msgstr "Podaj hasło do tego serwera:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5761,7 +5791,7 @@ "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:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Podaj unikalną nazwę dla tego zestawu filtrów" @@ -5769,11 +5799,11 @@ msgid "Please enter a username for this server:" msgstr "Podaj nazwę użytkownika do tego serwera:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Podaj poprawny zakres portów." -#: ../../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 "Podaj adres URL, z którego ma zostać pobrany Twój adres zewnętrzny" @@ -5783,7 +5813,7 @@ 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:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5791,14 +5821,14 @@ "Podaj polecenie FTP.\n" "Używanie poleceń FTP wyczyści pamięć podręczną katalogu." -#: ../../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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Wprowadź nazwę pliku, który powinien zostać utworzony:" @@ -5806,12 +5836,12 @@ 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:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Podaj swój zewnętrzny adres IP" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5829,7 +5859,7 @@ "Podążaj uważnie za instrukcjami, gdyż niewłaściwa konfiguracja uniemożliwi " "połączenia FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5837,11 +5867,11 @@ "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:136 +#: ../../locales/../src/interface/FileZilla.cpp:157 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:609 +#: ../../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 " @@ -5864,7 +5894,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:677 +#: ../../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." @@ -5880,7 +5910,7 @@ "Niektóre serwery mogą Cię zablokować, jeżeli próbujesz łączyć się zbyt " "często." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5889,7 +5919,7 @@ "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:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Wybierz akcję:" @@ -5924,7 +5954,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Wybierz nowe atrybuty dla zaznaczonych plików." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5942,8 +5972,8 @@ msgid "Positio&n of the message log:" msgstr "&Pozycja dziennika wiadomości:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "Kod pocztowy:" @@ -5955,12 +5985,12 @@ msgid "Preallocation" msgstr "Prealokacja" -#: ../../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 "Predefiniowane witryny" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Zachowywanie dat plików" @@ -5968,7 +5998,7 @@ msgid "Preview:" msgstr "Podgląd:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "Certyfikaty podstawowego połączenia i połączenia danych nie pasują." @@ -5985,7 +6015,7 @@ msgid "Prioritize directories (default)" msgstr "Nadaj piorytet katalogom (domyślne)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Priorytet" @@ -6015,7 +6045,7 @@ msgid "Process &Queue" msgstr "&Rozpocznij" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Przetwarzanie przepełnienia tabeli pliku" @@ -6025,11 +6055,11 @@ msgid "Processed %s in %s." msgstr "Przetwarzanie %s w %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protokół nieobsługiwany" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokół niewspierany na danym rodzaju gniazda" @@ -6046,37 +6076,41 @@ msgid "Proxy &user:" msgstr "&Użytkownik proxy:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Uwierzytelnianie proxy nie powiodło się." -#: ../../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 "Wymiana danych powitalnych z proxy nie powiodła się: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Odpowiedź proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Żądanie proxy nie powiodło się: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Żądanie proxy nie powiodło się: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" "Żądanie proxy nie powiodło się: Nieznany typ adresu w odpowiedzi CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxy ustawione, jednak host lub port proxy jest nieprawidłowy" @@ -6092,7 +6126,7 @@ msgid "Public permissions" msgstr "Publiczne prawa dostępu" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Kolejka została całkowicie przetworzona" @@ -6111,11 +6145,11 @@ msgid "Queue: empty" msgstr "Kolejka: pusta" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "Pliki w kolejce" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Kolejkowanie:" @@ -6132,7 +6166,7 @@ msgid "R&eset and requeue selected files" msgstr "Zr&esetuj zaznaczone pliki i ponownie dodaj do kolejki" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Polecenie FTP" @@ -6149,7 +6183,7 @@ msgid "Re&name" msgstr "Zmi&eń nazwę" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6165,12 +6199,12 @@ msgid "Read-only" msgstr "Tylko do odczytu" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Naprawdę przerwać bieżącą operację?" -#: ../../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 "" @@ -6179,8 +6213,8 @@ 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ą?" -#: ../../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?" @@ -6188,27 +6222,27 @@ msgstr[1] "Czy na pewno usunąć %d pliki z serwera?" msgstr[2] "Czy na pewno usunąć %d plików z serwera?" -#: ../../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 "Czy na pewno usunąć %s i %s z serwera?" -#: ../../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 "Na pewno usunąć wszystkie zaznaczone pliki i/lub katalogi z serwera?" -#: ../../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 "" "Na pewno usunąć wszystkie zaznaczone pliki i/lub katalogi ze swojego " "komputera?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Powód" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Zrestartuj teraz" @@ -6216,36 +6250,36 @@ msgid "Rec&urse into subdirectories" msgstr "Przechodź do podkatalogów" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "Otrzymano z serwera sygnał 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 "Otrzymano listę katalogów, która wydaje się być zakodowana w 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 "Otrzymano linę powyżej 10000 znaków, przerywanie." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Otrzymane dane zniekształcone" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Otrzymano nieprawidłowe znaki w informacji o wersji" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, c-format msgid "Received unknown TLS alert %d from the server" msgstr "Otrzymano z serwera nieznany sygnał TLS %d" -#: ../../locales/../src/interface/updater.cpp:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Otrzymane informacje o wersji są zbyt duże" @@ -6279,13 +6313,13 @@ msgid "Recursively deleting files and directories." msgstr "Rekurencyjne usuwanie plików i katalogów." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Przekierowanie do nieprawidłowego lub niewspieranego adresu: %s" @@ -6295,7 +6329,7 @@ msgid "Refresh the file and folder lists" msgstr "Odśwież plik i listę katalogów" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Zapamiętać hasła?" @@ -6303,20 +6337,20 @@ msgid "Remote" msgstr "Zdalny" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Zdalny certyfikat nie jest zaufany." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Zdalny plik" -#: ../../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 "Zdalne wyszukiwanie plików" @@ -6356,11 +6390,11 @@ "Zdalna ścieżka nie może być zanalizowana. Upewnij się, czy jest to poprawna " "bezwzględna ścieżka." -#: ../../locales/../src/interface/manual_transfer.cpp:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Zdalna ścieżka nie może być zanalizowana." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Obsługa zdalnej ścieżki:" @@ -6400,28 +6434,28 @@ msgid "Rename selected files and directories" msgstr "Zmień nazwy zaznaczonych plików i katalogów" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Zmiana nazwy z '%s' na '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Zgłoś błędy i propozycje funkcji" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Żądanie odrzucone lub nieudane" @@ -6437,28 +6471,28 @@ msgid "Reset and requeue &all" msgstr "Zresetuj &wszystkie pliki i ponownie dodaj do kolejki" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Ustalony protokół jest nieznany" -#: ../../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 "Ustalanie adresu IP dla %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Zasób tymczasowo niedostępny" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Odpowiedź" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Wyniki:" @@ -6477,19 +6511,19 @@ "Wznawianie plików ASCII może powodować problemy, jeżeli serwer używa innych " "zakończeń linii niż klient." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Uzyskiwanie listy katalogów w \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Uzyskiwanie listy katalogów..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Otrzymywanie zewnętrznego adresu IP z %s" @@ -6506,7 +6540,7 @@ msgid "S&hutdown system" msgstr "W&yłącz system" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "S&top" @@ -6526,7 +6560,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Proxy SOCKS4 połączy się z: %s" @@ -6535,17 +6569,17 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Zapisać ustawienia?" -#: ../../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 "" "Zapisywanie haseł zostało wyłączone przez administratora Twojego systemu." -#: ../../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 "Zapisywanie haseł zostało przez Ciebie wyłączone." @@ -6558,11 +6592,11 @@ msgid "Scanning for files to upload" msgstr "Skanuje w poszukiwaniu plików do wysłania na serwer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Warunki wyszukiwania:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "&Katalog wyszukiwania:" @@ -6578,8 +6612,8 @@ msgid "Security information" msgstr "Informacje o zabezpieczeniach" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Zobacz również: https://wiki.filezilla-project.org/Network_Configuration" @@ -6633,7 +6667,7 @@ msgstr "Wybierz plik dla eksportowanych danych" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Wybierz plik dla eksportowanej kolejki" @@ -6642,7 +6676,7 @@ msgstr "Wybierz plik dla eksportowanych ustawień" #: ../../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 "Wybierz plik dla eksportowanych witryn" @@ -6650,23 +6684,23 @@ msgid "Select file to import settings from" msgstr "Wybierz plik do importowania ustawień" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Wybierz plik do wysłania" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Wybierz nazwę pliku dla przekształconego pliku klucza" -#: ../../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 "Wybierz sposób, w jaki te pliki powinny być otwierane." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Wybierz docelowy katalog pobierania" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Wybierz nazwę pliku docelowego" @@ -6678,7 +6712,7 @@ msgid "Select the private data you would like to delete." msgstr "Wybierz prywatne dane, które chcesz usunąć." -#: ../../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." @@ -6694,7 +6728,7 @@ msgstr[1] "Zaznaczono %d katalogi." msgstr[2] "Zaznaczono %d katalogów." -#: ../../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." @@ -6718,7 +6752,7 @@ msgstr[1] "Zaznaczono %d pliki. Całkowity rozmiar: Co najmniej %s" msgstr[2] "Zaznaczono %d plików. Całkowity rozmiar: Co najmniej %s" -#: ../../locales/../src/interface/search.cpp:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Zaznaczone %s i %s do transferu." @@ -6756,7 +6790,7 @@ msgid "Selected file is still being edited" msgstr "Zaznaczony plik wciąż jest edytowany" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Zaznaczony filtr działa tylko dla plików lokalnych." @@ -6780,12 +6814,12 @@ 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:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Serial number:" msgstr "Numer seryjny:" @@ -6793,21 +6827,21 @@ msgid "Server &Type:" msgstr "&Typ serwera:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Serwer niepoprawnie zakończył połączenie TLS" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Serwer nie obsługuje znaków spoza ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6816,15 +6850,15 @@ "Serwer nie obsługuje wznawiania plików > %d GB. Koniec transferu gdyż " "rozmiary plików się zgadzają." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Serwer nie obsługuje wznawiania plików > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Serwer nie obsługuje wznawiania plików > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6833,7 +6867,7 @@ "Serwer może nie obsługiwać wznawiania plików > %d GB. Koniec transferu gdyż " "rozmiary plików się zgadzają." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6841,11 +6875,11 @@ "Serwer może wymagać posiadania konta. Wprowadź konto, używając Menedżera " "Stron" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Serwer zwrócił pustą ścieżkę." -#: ../../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." @@ -6853,13 +6887,13 @@ "Serwer wysłał dodatkową zachętę do zalogowania się. Musisz użyć " "interaktywnego typu logowania." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6868,14 +6902,14 @@ "zostanie użyty adres serwera." #: ../../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: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 "Serwer wysłał nieoczekiwaną odpowiedź." @@ -6891,7 +6925,7 @@ msgid "Server&type:" msgstr "&Typ serwera:" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Plik lokalny/serwerowy" @@ -6908,13 +6942,13 @@ msgid "Set &Priority" msgstr "U&staw priorytet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Ustaw prawa dostępu '%s' na '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../locales/../src/engine/transfersocket.cpp:791 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize wywołane bez gniazda" @@ -6934,7 +6968,7 @@ msgid "Show &welcome dialog..." msgstr "Pokaż okno po&witalne..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Pokazać obydwa drzewa katalogów i kontynuować porównywanie?" @@ -6954,7 +6988,7 @@ msgid "Shows this help dialog" msgstr "Pokazuje to okienko pomocy" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Wyłączanie systemu teraz" @@ -6994,23 +7028,23 @@ msgid "Site Manager already open" msgstr "Menedżer Stron jest już otworzony" -#: ../../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 "Adres nie istnieje." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 msgid "Site path has to begin with 0 or 1." msgstr "Adres powinien zaczynać się od 0 lub 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 "Ścieżka strony jest źle sformułowana." @@ -7029,7 +7063,7 @@ "Menedżerze Stron.\n" "Dodaj bieżące połączenie do Menedżera Stron?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Rozmiar" @@ -7048,43 +7082,43 @@ msgid "Skip file" msgstr "Pomiń plik" -#: ../../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 "Pomijanie pobierania %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 "Pomijanie wysyłania %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Adres gniazda poza przestrzenią adresu" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Gniazdo już połączone" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Gniazdo zostało wyłączone" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Gniazdo nie jest połączone" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Rodzaj gniazda niewspierany dla rodziny adresów" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Niektóre pliki są wciąż edytowane lub muszą zostać przesłane." @@ -7101,7 +7135,7 @@ msgid "Sort directories inline" msgstr "Sortuj katalogi in-line" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "" "Nie można zmienić kolejności sortowania w trakcie porównywania katalogów." @@ -7118,7 +7152,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Źródło i plik docelowy nie mogą być takie same" @@ -7130,7 +7164,7 @@ msgid "Source file:" msgstr "Plik źródłowy:" -#: ../../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" @@ -7168,19 +7202,19 @@ msgid "Start with opened Site Manager" msgstr "Otwórz Menedżera Stron przy starcie" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Rozpoczęgo sprawdzanie aktualizacji na %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Rozpoczynanie pobierania %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Rozpoczynanie wysyłania %s" @@ -7189,18 +7223,18 @@ msgid "Starts the local site in the given path" msgstr "Rozpoczyna lokalną stronę w danej ścieżce" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Państwo lub prowincja:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7212,7 +7246,7 @@ msgid "Stop recursive operation" msgstr "Zatrzymaj rekurencyjną operację" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Ulica:" @@ -7228,11 +7262,11 @@ msgid "Summary of test results:" msgstr "Podsumowanie wyników testu:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Wyłącz teraz" -#: ../../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." @@ -7240,24 +7274,24 @@ "Ta decyzja nie ma wpływu na symlinki do plików, takie linki są zawsze " "usuwane." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Synchronizowane przeglądanie" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synchronizowane przeglądanie zostało wyłączone." @@ -7271,8 +7305,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Błąd składni na linii poleceń" @@ -7284,11 +7318,11 @@ msgid "System details" msgstr "Szczegóły systemu" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Limit systemu przekroczenia otwartych plików" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Połączenie systemu z podsystemem nieudane" @@ -7296,19 +7330,19 @@ msgid "T&oolbar" msgstr "P&asek narzędzi" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "Połączenie TLS nawiązane, wysyłanie zapytania HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "Połączenie TLS nawiązane, oczekiwanie na wiadomość powitalną..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Połączenie TLS nawiązane." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL wygasł" @@ -7320,15 +7354,15 @@ msgid "Target file:" msgstr "Plik docelowy:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Plik docelowy już istnieje!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Plik docelowy już istnieje, naprawdę kontynuować?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Tymczasowe niepowodzenie w wymiarze nazwy" @@ -7336,7 +7370,7 @@ msgid "Test results" msgstr "Wyniki testu" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Testowanie zdolności wznowień serwera" @@ -7363,25 +7397,25 @@ "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:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Adres, który wprowadziłeś to: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Członek ai_family nie jest wspierany" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Zakładka nie mogła zostać dodana." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Zakładki nie mogły zostać wyczyszczone." @@ -7407,17 +7441,17 @@ "Własny format czasu jest nieprawidłowy lub zawiera niewspierane " "specyfikatory formatu." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/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: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 "Nie można znaleźć domyślnego edytora dla plików tekstowych." -#: ../../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 "Domyślny edytor dla plików tekstowych to '%s'." @@ -7428,7 +7462,7 @@ 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/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 "Rozszerzenie '%s' już istnieje na liście" @@ -7444,7 +7478,7 @@ "Wprowadź nową nazwę:" #: ../../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" @@ -7476,7 +7510,7 @@ msgstr "Plik '%s' nie mógł zostać załadowany." #: ../../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" @@ -7486,7 +7520,7 @@ "Żaden program nie został skojarzony w twoim systemie z tym typem pliku." #: ../../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" @@ -7508,7 +7542,7 @@ "danych.\n" "Chcesz kontynuować?" -#: ../../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" @@ -7556,7 +7590,7 @@ msgid "The following files are currently being edited:" msgstr "Następujące pliki są aktualnie edytowane:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Bezpłatne i otwarte rozwiązanie FTP" @@ -7578,17 +7612,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Limit musi być między 1 i 2000 MiB" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Nie można utworzyć katalogu lokalnego '%s'." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Lokalny katalog '%s' nie istnieje." -#: ../../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" @@ -7599,7 +7633,7 @@ "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu " "lokalnego?" -#: ../../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,16 +7650,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "Kolejka nie zostanie zapisana." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Zdalny katalog '%s' nie istnieje." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7666,11 +7700,11 @@ "To może być niebezpieczne i może uszkodzić Twój system.\n" "Na pewno chcesz kontynuować?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Serwer nie mógł zostać dodany." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Serwer wysłał nieoczekiwaną lub nierozpoznaną odpowiedź." @@ -7704,7 +7738,7 @@ "Klucz hosta serwera jest nieznany. Nie masz gwarancji, że ten serwer jest na " "pewno tym, którego szukasz." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Parametr nazwy serwera nie jest wspierany przy ai_socktype" @@ -7716,19 +7750,19 @@ "Ustawienia zostały zaimportowane. Musisz zrestartować FileZilla, aby " "wszystkie ustawienia odniosły skutek." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Określona rodzina adresów nie jest wspierana" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Określona nazwa sieci nie jest już dostępna" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "System wkrótce się zamknie, chyba że klikniesz Anuluj." @@ -7740,7 +7774,7 @@ "Plik docelowy już istnieje.\n" "Proszę wybrać jakąś akcję." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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?" @@ -7753,15 +7787,15 @@ msgid "Themes" msgstr "Style" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Zestaw filtrów nie może zostać usunięty." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Ten zestaw filtrów nie może mieć innej nazwy." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7784,7 +7818,7 @@ "Ten kreator pomoże prawidłowo skonfigurować wszelkie posiadane przez Ciebie " "routery i zapory oraz przetestuje Twoją konfigurację." -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Czas" @@ -7797,25 +7831,25 @@ msgstr "&Limit czasu oczekiwania w sekundach:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Limit czasu oczekiwania" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Tytuł:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -7880,17 +7914,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Włącz/wyłącz okno kolejki transferów" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Za długa linia nagłówka" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Za dużo przekierowań" -#: ../../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 "Dojście:" @@ -7919,17 +7953,17 @@ msgid "Transfer Settings" msgstr "Ustawienia przesyłania" -#: ../../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 "Przesyłanie przerwane: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Przesłane dane niepoprawne." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Przesyłanie" @@ -7938,8 +7972,8 @@ msgid "Transfers" msgstr "Transfery" +#: ../../locales/../src/interface/QueueView.cpp:2944 #: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Transfery zakończone" @@ -7951,11 +7985,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "&Traktuj następujące typy plików jako pliki ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Ufaj zmienionemu kluczowi hosta:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Ufaj nowemu kluczowi hosta:" @@ -7993,7 +8027,7 @@ msgid "U&pload" msgstr "W&yślij" -#: ../../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 "Limit wysyłania:" @@ -8003,20 +8037,20 @@ msgstr "&Użyj skojarzeń typów plików, jeśli są dostępne" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "&Użyj domyślnych wartości systemowych" +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 msgid "USER@&HOST" msgstr "USER@&HOST" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Nieprzypisany kod błędu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Jednostka:" @@ -8025,11 +8059,11 @@ msgid "Unknown" msgstr "Nieznany" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "Nieznany typ FTP proxy, nie można wygenerować sekwencji logowania." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Nieznana wersja protokołu SOCKS: %d" @@ -8042,7 +8076,7 @@ msgid "Unknown host key" msgstr "Nieznany klucz hosta" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8058,8 +8092,8 @@ "Nieznany główny element, plik nie wydaje się być wygenerowany przez " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8067,7 +8101,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:598 +#: ../../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." @@ -8075,11 +8109,11 @@ "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:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Nieobsługiwany typ certyfikatu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Nieobsługiwane przekierowanie" @@ -8149,12 +8183,12 @@ msgid "Use &custom editor:" msgstr "Użyj własnego edytora:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Użyj &synchronizowanego przeglądania" @@ -8182,8 +8216,8 @@ msgstr "Użyj serwera z Menedżera Stron" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Użyj &domyślnych wartości systemowych" +msgid "Use system &defaults for current language" +msgstr "Użyj &domyślnego edytora systemu dla bieżącego języka" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8218,7 +8252,7 @@ msgid "User:" msgstr "Użytkownik:" -#: ../../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 "Nazwa użytkownika nie może składać się ze spacji" @@ -8242,7 +8276,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Szczegółowe logi wiadomości z wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Weryfikacja certyfikatu..." @@ -8250,7 +8284,7 @@ msgid "Very high" msgstr "Bardzo wysoka" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "" "Wyświetlanie ukrytych plików ustawione, ale nieobsługiwane przez serwer" @@ -8267,15 +8301,15 @@ msgid "W&rite" msgstr "Z&apis" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "Oczekiwanie" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Oczekiwanie na połączenie do przeglądania" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Oczekiwanie na hasło" @@ -8287,7 +8321,7 @@ msgid "Waiting to retry..." msgstr "Oczekiwanie na ponowienie..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Ostrzeżenie, ignorowanie połączenia danych z niewłaściwego IP." @@ -8310,11 +8344,11 @@ msgid "Warning: Potential security breach!" msgstr "Uwaga: Potencjalne złamanie zabezpieczeń!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Witaj w FileZilli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Co nowego" @@ -8322,7 +8356,7 @@ msgid "What's new:" msgstr "Co nowego:" -#: ../../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." @@ -8347,7 +8381,7 @@ msgid "Widescreen" msgstr "Szeroki ekran" -#: ../../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 "Czy chcesz, aby FileZilla pamiętała hasła?" @@ -8355,20 +8389,20 @@ msgid "Wr&ite" msgstr "Zapi&s" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Nieprawidłowy zewnętrzny adres IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Nieprawidłowe zakończenia linii" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Tak" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8380,7 +8414,7 @@ msgid "You are using the latest version of FileZilla." msgstr "Używasz najnowszej wersji 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 "Zawsze możesz ponownie otworzyć to okno poprzez menu Pomoc." @@ -8417,19 +8451,19 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 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: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?" @@ -8437,7 +8471,7 @@ "Wybrano więcej niż 10 plików lub katalogów do otwarcia, czy na pewno chcesz " "kontynuować?" -#: ../../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 "Musisz podać nazwę hosta." @@ -8446,30 +8480,30 @@ msgid "You have to enter a key file path" msgstr "Musisz podać ścieżkę pliku klucza" -#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Musisz podać katalog lokalny." -#: ../../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 "Musisz podać poprawny adres IP." +#: ../../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 "Musisz podać poprawny adres IPv4." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Musisz podać zapisywalny katalog lokalny." -#: ../../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 "Musisz podać nazwę konta" -#: ../../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 "Musisz podać nazwę użytkownika" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8523,23 +8557,23 @@ "Musisz wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić " "synchronizowane przeglądanie dla tej strony." -#: ../../locales/../src/interface/manual_transfer.cpp:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Musisz podać plik lokalny." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Musisz podać zdalny plik." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Musisz podać zdalną ścieżkę." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Musisz podać serwer." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8547,7 +8581,7 @@ "Nie powinny występować problemy w łączeniu się z innymi serwerami, transfer " "plików powinien działać poprawnie." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Twój komputer zostanie wyłączony, chyba że naciśniesz Anuluj." @@ -8572,7 +8606,7 @@ msgid "contains" msgstr "zawiera" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "własne" @@ -8594,19 +8628,19 @@ msgid "equals" msgstr "równa się" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "plik" -#: ../../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 " @@ -8616,15 +8650,15 @@ "Proszę upewnić się, że plik wykonywalny istnieje w tym samym katalogu, co " "plik wykonywalny FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp należy do innej wersji FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp nie mógł zostać uruchomiony" -#: ../../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 zwróciła brak certyfikatów" @@ -8680,10 +8714,10 @@ msgid "owner writeable" msgstr "zapis - właściciel" -#: ../../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: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 "nieznany" @@ -8704,6 +8738,26 @@ 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 " diff -Nru filezilla-3.14.1/locales/pt_PT.po filezilla-3.15.0.2/locales/pt_PT.po --- filezilla-3.14.1/locales/pt_PT.po 2015-04-20 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/locales/pt_PT.po 2016-02-05 08:54:45.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: FileZilla 3 pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-16 16:47+0100\n" -"PO-Revision-Date: 2015-04-12 15:53-0000\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" "Language-Team: enVide neFelibata \n" "Language: pt_PT\n" @@ -48,9 +48,9 @@ msgstr[0] "%d diretório" msgstr[1] "%d diretórios" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:453 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../locales/../src/interface/RemoteListView.cpp:1390 +#: ../../locales/../src/interface/search.cpp:478 +#: ../../locales/../src/interface/search.cpp:764 #, c-format msgid "%d directory with its contents" msgid_plural "%d directories with their contents" @@ -59,9 +59,9 @@ #: ../../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/RemoteListView.cpp:1389 +#: ../../locales/../src/interface/search.cpp:477 +#: ../../locales/../src/interface/search.cpp:763 #, c-format msgid "%d file" msgid_plural "%d files" @@ -82,12 +82,12 @@ msgstr[0] "%d ficheiro. Tamanho: No mínimo %s" msgstr[1] "%d ficheiros. Tamanho: No mínimo %s" -#: ../../locales/../src/interface/QueueView.cpp:2797 +#: ../../locales/../src/interface/QueueView.cpp:2781 #, c-format msgid "%d files added to queue" msgstr "%d ficheiros adicionados à lista" -#: ../../locales/../src/engine/ControlSocket.cpp:101 +#: ../../locales/../src/engine/ControlSocket.cpp:104 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -98,6 +98,20 @@ msgid "%h - Host" msgstr "%h - Servidor" +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#, 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 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu ficheiro" +msgstr[1] "%llu ficheiros" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" @@ -113,12 +127,12 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:44 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certificado expirou!" -#: ../../locales/../src/interface/verifycertdialog.cpp:31 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Ainda não é válido!" @@ -138,14 +152,14 @@ msgid "%s and %s. Total size: At least %s" msgstr "%s e %s. Tamanho: No mínimo %s" -#: ../../locales/../src/engine/sizeformatting_base.cpp:72 +#: ../../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:670 +#: ../../locales/../src/interface/FileZilla.cpp:595 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -160,7 +174,7 @@ "Por favor, descarregue o FileZilla novamente. Se este problema persistir, " "por favor reporte este erro." -#: ../../locales/../src/interface/FileZilla.cpp:755 +#: ../../locales/../src/interface/FileZilla.cpp:680 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -178,7 +192,7 @@ "pastas do sistema.\n" "- Indique o caminho completo para o %s na lista do FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:60 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s com %d bits" @@ -192,7 +206,7 @@ msgid "%w - Proxy password" msgstr "%w - Palavra-passe do Proxy" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Abortar a ligação anterior e ligar no separador actual" @@ -200,14 +214,14 @@ msgid "&About..." msgstr "&Sobre ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../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 "&Conta:" #: ../../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:448 msgid "&Active" msgstr "&Activo" @@ -221,15 +235,15 @@ msgstr "&Adicionar ficheiros à lista" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Adicionar chave de ficheiro ..." +msgid "&Add key file..." +msgstr "&Adicionar ficheiro chave ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" msgstr "&Adicionar à lista" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "&Ajustar a diferença do fuso horário do servidor:" @@ -237,7 +251,7 @@ msgid "&Always trust certificate in future sessions." msgstr "&Confiar sempre neste certificado em sessões futuras." -#: ../../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 "&Confiar sempre neste servidor, adicionar esta chave ao cofre" @@ -245,7 +259,7 @@ msgid "&Always use default editor" msgstr "&Utilizar sempre o editor predefinido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Utilizar sempre a selecção para ficheiros não associados" @@ -258,17 +272,17 @@ 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:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 #: ../../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:510 msgid "&Autodetect" msgstr "&Auto-detectar" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Binário" @@ -281,14 +295,14 @@ msgid "&Bookmarks" msgstr "&Marcadores" -#: ../../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/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:295 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 msgid "&Browse..." msgstr "&Explorar ..." @@ -297,9 +311,9 @@ msgstr "&Tolerância à falha" #: ../../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: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" @@ -317,7 +331,7 @@ msgid "&Close FileZilla" msgstr "&Sair do FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Configurar os limites de velocidade..." @@ -325,7 +339,7 @@ msgid "&Configure..." msgstr "&Configurar..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "&Ligar" @@ -333,19 +347,19 @@ 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:787 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 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:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 msgid "&Create directory" msgstr "&Criar pasta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "&Criar novo separador" @@ -370,16 +384,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: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:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Apagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Apagar a ligação simbólica" @@ -387,7 +401,21 @@ msgid "&Directory comparison" msgstr "&Comparação de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:893 +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 +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 msgid "&Discard local file then download and edit file anew" msgstr "" "&Descartar o ficheiro local e depois transferir e editar um ficheiro novo" @@ -410,7 +438,7 @@ msgid "&Display size in bytes" msgstr "&Mostrar o tamanho em bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Não lembrar as palavras-passe (recomendado)" @@ -427,19 +455,19 @@ msgstr "Acção para o clique &duplo nos ficheiros:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "&Transferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Transferir para:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "&Transferir ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" msgstr "&Descargas:" @@ -449,14 +477,14 @@ msgid "&Edit" msgstr "&Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../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:517 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" msgstr "&Activar" @@ -464,12 +492,12 @@ msgid "&Enable compression" msgstr "&Activar compressão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../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:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "&Codificação:" @@ -477,11 +505,11 @@ msgid "&Encryption:" msgstr "&Encriptação:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "&Indique um comando personalizado ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Ligar num novo separador" @@ -489,12 +517,12 @@ msgid "&Execute" msgstr "&Executar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 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:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." msgstr "&Exportar ..." @@ -506,7 +534,7 @@ msgid "&File" msgstr "&Ficheiro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Atributos do ficheiro ..." @@ -514,27 +542,27 @@ msgid "&File permissions..." msgstr "Permissões do &ficheiro ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Ficheiro:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" msgstr "Condições para os &filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Conjuntos de filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Filtros:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 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:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -542,7 +570,7 @@ "&Unir os caminhos remotos, transferir todos os ficheiros directamente para a " "pasta indicada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Seguir a ligação simbólica, apagar o conteúdo da pasta indicada" @@ -554,7 +582,7 @@ msgid "&Getting help..." msgstr "&Obter ajuda ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Marcador Universal" @@ -567,7 +595,7 @@ msgstr "&Ajuda" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Esconder ficheiros idênticos" @@ -579,7 +607,7 @@ msgid "&Highest available port:" msgstr "&Porta maior disponível:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 +#: ../../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:" @@ -605,10 +633,14 @@ msgid "&Install new version" msgstr "&Instalar a nova versão" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "&Manter a estrutura remota de caminhos relativa à raiz de procura" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "Ficheiro chave:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Aparência das janelas de ficheiros e pastas:" @@ -617,7 +649,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Limitar as portas locais usadas pelo FileZilla" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "&Limitar o número de ligações simultâneas" @@ -625,8 +657,8 @@ msgid "&Local directory tree" msgstr "&Árvore de ficheiros local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "Pasta &local:" @@ -634,11 +666,11 @@ msgid "&Log to file" msgstr "&Ligar ao ficheiro" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Tipo de início de sessão:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Tipo de início de sessão:" @@ -654,7 +686,7 @@ msgid "&Manual transfer..." msgstr "Transferência &manual ..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "&Número máximo de ligações:" @@ -674,7 +706,7 @@ msgid "&Name sorting mode:" msgstr "Modo de ordenação por &nome:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Nome:" @@ -682,7 +714,7 @@ msgid "&Network configuration wizard..." msgstr "&Assistente de configuração de rede ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "&Novo" @@ -690,16 +722,16 @@ msgid "&New Site" msgstr "&Novo Sítio" -#: ../../locales/../src/interface/Mainfrm.cpp:1736 +#: ../../locales/../src/interface/Mainfrm.cpp:1663 msgid "&New version available!" msgstr "&Nova versão disponível!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Próximo >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&Não" @@ -717,8 +749,8 @@ msgstr "&Valor numérico:" #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&OK" @@ -727,7 +759,7 @@ msgstr "&ABRIR" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" msgstr "&Abrir" @@ -735,7 +767,7 @@ msgid "&Overwrite" msgstr "&Substituir" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Passivo" @@ -747,7 +779,7 @@ msgid "&Play sound" msgstr "&Reproduzir som" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 +#: ../../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:" @@ -757,7 +789,7 @@ msgid "&Preserve timestamps of transferred files" msgstr "&Preservar a data e a hora dos ficheiros transferidos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "&Lista" @@ -769,6 +801,10 @@ msgid "&Quickconnect bar" msgstr "&Barra de ligação rápida" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "Histórico de ligações &rápidas" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Ler" @@ -777,8 +813,12 @@ msgid "&Reconnect" msgstr "&Voltar a ligar" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +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:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" msgstr "&Actualizar" @@ -786,16 +826,16 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Lembrar palavra-passe até que o FileZilla encerre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Lembrar as palavra-passe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../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:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "Caminho &remoto:" @@ -811,21 +851,21 @@ msgid "&Remove selected" msgstr "&Remover seleccionados" -#: ../../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:2830 #: ../../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/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" msgstr "&Mudar o Nome" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." msgstr "&Mudar o nome ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" msgstr "&Reabrir o ficheiro local" @@ -837,7 +877,7 @@ msgid "&Report a bug..." msgstr "&Reportar um erro ..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" msgstr "&Limpar e voltar a listar todos os ficheiros" @@ -869,11 +909,11 @@ msgid "&SOCKS 5" msgstr "&SOCKS 5" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." msgstr "&Guardar como ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Procurar" @@ -887,18 +927,18 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" -msgstr "&Seleccionar linguagem:" +msgstr "&Seleccionar idioma:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "Seleccione as colunas a serem mostradas:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2298 +#: ../../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:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "&Configurações" @@ -910,7 +950,7 @@ msgid "&Show debug menu" msgstr "&Mostrar o menu de correcção de erros" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "&Mostrar detalhes" @@ -922,11 +962,15 @@ 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 +msgid "&Site Manager entries" +msgstr "Entradas do &Gestor de Sítios" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:7 msgid "&Site Manager..." msgstr "&Gestor de Sítios ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Marcador próprio para o sítio" @@ -938,7 +982,7 @@ msgid "&Speed limits" msgstr "Limites de &velocidade" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Começar a transferência de imediato" @@ -946,11 +990,11 @@ msgid "&Swap local and remote panes" msgstr "&Trocar a ordem das janelas local e remota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "Cifras &TLS:" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:244 msgid "&Test" msgstr "&Teste" @@ -962,10 +1006,11 @@ msgid "&Transfer" msgstr "&Transferência" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 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 "&Lista de transferências" @@ -974,29 +1019,29 @@ msgid "&Treat dotfiles as ASCII files" msgstr "&Tratar ficheiros de ponto como ficheiros ASCII" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" msgstr "&Sem editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 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:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Enviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" msgstr "&Envios:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Usar um programa próprio" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "&Usar a navegação sincronizada" @@ -1017,8 +1062,8 @@ msgstr "Usar o &separador dos milhares" #: ../../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:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Utilizador:" @@ -1026,7 +1071,7 @@ msgid "&Username:" msgstr "&Nome de utilizador:" -#: ../../locales/../src/interface/Mainfrm.cpp:1730 +#: ../../locales/../src/interface/Mainfrm.cpp:1657 #, c-format msgid "&Version %s" msgstr "&Versão %s" @@ -1036,7 +1081,7 @@ msgstr "&Ver" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Ver/Editar" @@ -1053,26 +1098,26 @@ msgid "&Write" msgstr "&Escrever" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../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: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' não existe ou não pode ser acedido." -#: ../../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' não é uma pasta." #: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:956 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" msgstr "O início de sessão 'Conta' não é suportado pelo protocolo seleccionado" @@ -1084,7 +1129,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:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1092,7 +1137,7 @@ "Os tipos de início de sessão 'Normal' e 'Conta' não estão disponíveis. A sua " "entrada foi alterada para 'Pedir Palavra-chave'." -#: ../../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 " @@ -1136,8 +1181,8 @@ msgid "(10-9999, 0 to disable)" msgstr "(10-9999, 0 para nenhum)" -#: ../../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á configurado para %d.%d)" @@ -1150,8 +1195,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(exemplo: %Y-%m-%d)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3537 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3554 +#: ../../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 @@ -1198,7 +1243,7 @@ msgid "3 - Verbose" msgstr "3 - Verboso" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" msgstr "sistema de 32 bits" @@ -1206,11 +1251,11 @@ msgid "4 - Debug" msgstr "4 - Correcção de erros" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:96 msgid "64-bit system" msgstr "sistema de 64 bits" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Anterior" @@ -1218,7 +1263,7 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 msgid "" "A bookmark with the entered name already exists. Please enter an unused name." msgstr "" @@ -1229,8 +1274,8 @@ msgstr "É necessário predefinir um editor" #: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:742 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." @@ -1245,22 +1290,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:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." msgstr "Um ficheiro previamente aberto foi alterado." -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1644 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:1683 +#: ../../locales/../src/interface/edithandler.cpp:1648 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:649 +#: ../../locales/../src/interface/FileZilla.cpp:574 msgid "" "A local filename could not be decoded.\n" "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set " @@ -1279,7 +1324,7 @@ msgid "A new version of FileZilla is available:" msgstr "Está disponível uma nova versão do FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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,7 +1341,7 @@ "Um servidor bem configurado não requer isto. Contacte o administrador do " "servidor se precisar disto." -#: ../../locales/../src/interface/state.cpp:283 +#: ../../locales/../src/interface/state.cpp:257 msgid "" "A remote operation is in progress and synchronized browsing is enabled.\n" "Disable synchronized browsing and continue changing the local directory?" @@ -1307,7 +1352,7 @@ "local?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1332,11 +1377,11 @@ msgid "A&pply to all files and directories" msgstr "A&plicar a todos os ficheiros e pastas" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "&Remover automaticamente as transferências bem sucedidas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1348,15 +1393,15 @@ msgid "Above the file lists" msgstr "Acima das listas de ficheiros" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 +#: ../../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:1276 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1277 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 msgid "Account" msgstr "Conta" @@ -1364,11 +1409,11 @@ msgid "Action after queue &completion" msgstr "Resposta após a lista estar &completa" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "Acção para o ficheiro seleccionado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Acção a realizar:" @@ -1380,7 +1425,7 @@ msgid "Active mode" msgstr "Modo activo" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:621 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1388,7 +1433,7 @@ "Falhou o teste ao modo activo do FTP. O FileZilla desconhece o endereço IP " "externo correcto." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../locales/../src/interface/netconfwizard.cpp:608 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." @@ -1396,7 +1441,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:595 +#: ../../locales/../src/interface/netconfwizard.cpp:596 msgid "" "Active mode FTP test failed. FileZilla knows the correct external IP " "address, but your router or firewall has misleadingly modified the sent " @@ -1410,12 +1455,12 @@ msgid "Active mode IP" msgstr "Activar o modo IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "&Adicionar ficheiros apenas à lista" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../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 "Adicionar as pastas seleccionadas à lista de transferências" @@ -1430,11 +1475,11 @@ msgid "Add to queue" msgstr "Adicionar à lista" -#: ../../locales/../src/engine/proxy.cpp:488 +#: ../../locales/../src/engine/proxy.cpp:505 msgid "Address type not supported" msgstr "O tipo do endereço não é suportado" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Avançado" @@ -1453,15 +1498,15 @@ "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:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Executar sempre esta acção" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Algoritmo:" -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "All files have been successfully transferred" msgstr "Todos os ficheiros foram transferidos com sucesso" @@ -1469,7 +1514,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:2975 +#: ../../locales/../src/interface/QueueView.cpp:2946 #, 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." @@ -1487,11 +1532,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:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Já ligado" -#: ../../locales/../src/interface/verifycertdialog.cpp:81 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Nome alternativo:" @@ -1521,7 +1566,7 @@ "Em alternativa, também pode descarregar a última versão a partir do sítio do " "FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1925 +#: ../../locales/../src/interface/QueueView.cpp:1911 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1530,7 +1575,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:1830 +#: ../../locales/../src/interface/QueueView.cpp:1821 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1539,7 +1584,7 @@ "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:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 msgid "" "An item with the same name as the dragged item already exists at the target " "location." @@ -1547,39 +1592,31 @@ "Um item com o mesmo nome daquele que está a ser arrastado já existe no " "destino." -#: ../../locales/../src/engine/server.cpp:857 +#: ../../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:1275 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1516 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1308 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1582 msgid "Anonymous" msgstr "Anónimo" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:943 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:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 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/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Não será guardada qualquer alteração no Gestor de Sítios sem que repare o " -"ficheiro." - -#: ../../locales/../src/interface/filter.cpp:213 +#: ../../locales/../src/interface/filter.cpp:212 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:971 +#: ../../locales/../src/interface/filter.cpp:969 msgid "Any changes made to the filters will not be saved." msgstr "Não será guardada qualquer alteração nos filtros." @@ -1587,7 +1624,7 @@ msgid "App&ly to directories only" msgstr "Apl&icar apenas a pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" msgstr "Aplicar" @@ -1603,7 +1640,7 @@ msgid "Archive" msgstr "&Ficheiro" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "Argument buffer overflow" msgstr "Excedido o argumento do buffer" @@ -1611,16 +1648,16 @@ 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:1390 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1413 +#: ../../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" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 +#: ../../locales/../src/engine/server.cpp:856 +#: ../../locales/../src/engine/server.cpp:877 #: ../../locales/../src/interface/manual_transfer.cpp:181 msgid "Ask for password" msgstr "Pedir palavra-passe" @@ -1633,7 +1670,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:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Fazer perguntas nos Fóruns do FileZilla" @@ -1641,7 +1678,7 @@ msgid "Associated program not found:" msgstr "Não foi encontrado o programa associado:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../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" @@ -1653,7 +1690,7 @@ msgid "Attribute" msgstr "Atributo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 msgid "Authentication failed." msgstr "Falhou a validação." @@ -1661,7 +1698,7 @@ msgid "Author:" msgstr "Autor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Auto" @@ -1673,20 +1710,20 @@ msgid "Available sizes" msgstr "Tamanhos disponíveis" -#: ../../locales/../src/engine/sizeformatting_base.cpp:160 -#: ../../locales/../src/engine/sizeformatting_base.cpp:219 +#: ../../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:309 msgid "B&ypass proxy" msgstr "Con&tornar o proxy" -#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Bad file descriptor" msgstr "Descritor de ficheiro errado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Instruções básicas de utilização" @@ -1694,16 +1731,16 @@ msgid "Behaviour" msgstr "Comportamento" -#: ../../locales/../src/interface/edithandler.cpp:1130 -#: ../../locales/../src/interface/edithandler.cpp:1158 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "A ser editado" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1111 msgid "Beware! Certificate has been revoked" msgstr "Atenção! O Certificado foi revogado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Binário" @@ -1711,20 +1748,24 @@ msgid "Blackboard" msgstr "Quadro negro" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 msgid "Bookmark" msgstr "Marcador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Marcador:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Marcadores" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Explorar ..." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Data da versão:" @@ -1733,7 +1774,7 @@ msgid "Build information" msgstr "Informações da versão" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Categoria de negócio:" @@ -1751,12 +1792,12 @@ msgid "C&ancel current operation" msgstr "C&ancelar a operação actual" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" msgstr "L&impar tudo" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "C&opiar os caminhos URL para a área de transferência" @@ -1768,22 +1809,26 @@ msgid "C&ustom filetype associations:" msgstr "A&ssociações dos tipos de ficheiro predefinidas:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1605 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1209 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "Caraterísticas do CPU:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 msgid "Calculating timezone offset of server..." msgstr "A calcular o fuso horário do servidor..." -#: ../../locales/../src/engine/transfersocket.cpp:639 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Impossível ler a partir do ficheiro" -#: ../../locales/../src/engine/transfersocket.cpp:619 -#: ../../locales/../src/engine/transfersocket.cpp:685 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:716 msgid "Can't write data to file." msgstr "Impossível escrever dados para o ficheiro." -#: ../../locales/../src/engine/transfersocket.cpp:621 -#: ../../locales/../src/engine/transfersocket.cpp:687 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:718 #, c-format msgid "Can't write data to file: %s" msgstr "Não é possível escrever dados para o ficheiro: %s" @@ -1791,23 +1836,24 @@ #: ../../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: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 "Cancelar" @@ -1819,22 +1865,22 @@ msgid "Cancels the current operation" msgstr "Cancela a operação actual" -#: ../../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 "" "Não é possível aceder a '%s', nenhum disco inserido ou o leitor não está " "preparado." -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 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:1091 +#: ../../locales/../src/engine/socket.cpp:1112 msgid "Cannot assign requested address" msgstr "Incapaz de aplicar endereço pedido" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:349 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1842,7 +1888,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:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1850,30 +1896,26 @@ "Não é possivel comparar as pastas, existem filtros diferentes para as pastas " "locais e remotas" -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "Não é possível comparar pastas, não está ligado 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:1609 -#: ../../locales/../src/interface/edithandler.cpp:1657 -#: ../../locales/../src/interface/LocalListView.cpp:1712 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/search.cpp:712 msgid "Cannot edit file" msgstr "Não é possível editar o ficheiro" -#: ../../locales/../src/interface/LocalListView.cpp:1594 +#: ../../locales/../src/interface/LocalListView.cpp:1582 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:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1591 msgid "Cannot edit file, remote path unknown." msgstr "Não é possível editar o ficheiro, o caminho remoto é desconhecido." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:324 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:340 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1888,11 +1930,11 @@ "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:388 -msgid "Cannot load keyfile" -msgstr "Não é possível carregar a chave de ficheiro" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Não é possível carregar o ficheiro chave" -#: ../../locales/../src/interface/Mainfrm.cpp:1032 +#: ../../locales/../src/interface/Mainfrm.cpp:993 msgid "Cannot load toolbar from resource file" msgstr "" "Não é possível carregar a barra de ferramentas a partir de ficheiro de " @@ -1902,41 +1944,41 @@ msgid "Cannot remember password" msgstr "Não é possível lembrar a palavra-passe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Cannot rename entry" msgstr "Não é possível mudar o nome da entrada" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1589 msgid "Cannot rename file" msgstr "Não é possível mudar o nome do ficheiro" -#: ../../locales/../src/engine/proxy.cpp:131 +#: ../../locales/../src/engine/proxy.cpp:148 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:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:339 +#: ../../locales/../src/interface/filter.cpp:403 msgid "Cannot save filterset" msgstr "Não é possível guardar o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:303 msgid "Cannot select filter" msgstr "Não é possível seleccionar o filtro" -#: ../../locales/../src/interface/edithandler.cpp:1506 -#: ../../locales/../src/interface/edithandler.cpp:1510 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Não é possível configurar as associações dos ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1089 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Não é possível mostrar a caixa de diálogo" -#: ../../locales/../src/interface/edithandler.cpp:1679 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Não é possível ler/editar o ficheiro seleccionado" @@ -1956,11 +1998,11 @@ msgid "Case sensitive (default)" msgstr "Sensível a maiúsculas/minúsculas (por defeito)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" -msgstr "Categorias" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "Categorias a limpar" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../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." @@ -1981,7 +2023,7 @@ msgstr "Alterar atributos do ficheiro" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Alterar as permissões do ficheiro." @@ -1991,11 +2033,11 @@ "A alteração das configurações do ficheiro 'logfile' requer que reinicie o " "FileZila." -#: ../../locales/../src/interface/FileZilla.cpp:649 +#: ../../locales/../src/interface/FileZilla.cpp:574 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:497 msgid "Charset" msgstr "Mapa de caracteres" @@ -2019,7 +2061,7 @@ msgid "Check for updates failed" msgstr "Procurar por actualizações falhadas" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2027,7 +2069,7 @@ "Verifique as suas credenciais de entrada. A palavra-passe indicada inicia ou " "termina com um espaço." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2035,7 +2077,7 @@ "Verifique as suas credenciais de entrada. O nome de utilizador indicado " "inicia ou termina com um espaço." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:771 msgid "Checking for correct external IP address" msgstr "A verificar pelo endereço IP externo correcto" @@ -2043,27 +2085,31 @@ msgid "Checking for updates..." msgstr "A procurar actualizações ..." -#: ../../locales/../src/interface/updater.cpp:779 +#: ../../locales/../src/interface/updater.cpp:715 #, 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:775 +#: ../../locales/../src/interface/updater.cpp:711 #, 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:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +msgid "Choose a key file" +msgstr "Escolha um ficheiro chave" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 msgid "Choose the default local directory" msgstr "Escolha a pasta local predefinida" -#: ../../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:124 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2242 msgid "Choose the local directory" msgstr "Escolha a pasta local" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 msgid "Chunk data improperly terminated" msgstr "Dados tratados indevidamente" @@ -2072,7 +2118,7 @@ msgstr "Cifra:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "Fe&char separador" @@ -2080,31 +2126,15 @@ msgid "Classic" msgstr "Clássico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "Limpar &as entradas do Gestor de Sítios" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" msgstr "Limpar &a vista do cofre" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "Limpar &o histórico das ligações rápidas" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "Limpar &o registo das ligações" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Limpar &a lista de transferências" - -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Clear history" msgstr "Limpar o histórico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 +#: ../../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 @@ -2113,29 +2143,29 @@ msgid "Clear private data" msgstr "Limpar os dados privados" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:149 msgid "Clear quickconnect bar" msgstr "Limpar a barra de ligação rápida" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:587 msgid "Click on Finish to save your configuration." msgstr "Prima em Terminar para guardar a configuração." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2037 +#: ../../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:2027 +#: ../../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:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" msgstr "Fechar &todos os outros separadores" #: ../../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:1134 +#: ../../locales/../src/interface/Mainfrm.cpp:1155 msgid "Close FileZilla" msgstr "Sair do FileZilla" @@ -2147,15 +2177,15 @@ msgid "Closes current tab" msgstr "Fecha o separador actual" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Co&mentários:" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "Column properties" msgstr "Propriedades da coluna" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Configuração da coluna" @@ -2163,46 +2193,46 @@ 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/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:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 msgid "Command failed" msgstr "O comando falhou" -#: ../../locales/../src/engine/proxy.cpp:485 +#: ../../locales/../src/engine/proxy.cpp:502 msgid "Command not supported" msgstr "O comando não é suportado" -#: ../../locales/../src/engine/engineprivate.cpp:209 +#: ../../locales/../src/engine/engineprivate.cpp:212 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:276 -#: ../../locales/../src/interface/StatusView.cpp:332 +#: ../../locales/../src/interface/StatusView.cpp:283 +#: ../../locales/../src/interface/StatusView.cpp:339 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:214 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Nome comum:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:442 +#: ../../locales/../src/interface/netconfwizard.cpp:457 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:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 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:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Comparar o &tamanho do ficheiro" @@ -2238,8 +2268,8 @@ msgid "Concurrent transfers" msgstr "Transferências simultâneas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "As condições são sensíveis a m&aiúsculas e minúsculas" @@ -2255,28 +2285,28 @@ msgid "Configure port range" msgstr "Configurar o intervalo de portas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Configurar o FileZilla e a sua rede" -#: ../../locales/../src/interface/search.cpp:743 +#: ../../locales/../src/interface/search.cpp:768 msgid "Confirm deletion" msgstr "Confirme para apagar" -#: ../../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/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 msgid "Confirmation needed" msgstr "Confirmação necessária" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "Congratulations, your configuration seems to be working." msgstr "Parabéns, a configuração parece estar funcionar." -#: ../../locales/../src/interface/quickconnectbar.cpp:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:148 msgid "Connect bypassing proxy settings" msgstr "A conectar as configurações de contorno do proxy" @@ -2292,27 +2322,28 @@ 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:910 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 msgid "Connected" msgstr "Ligado" -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:326 msgid "Connecting" msgstr "A ligar" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:223 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 +#: ../../locales/../src/engine/ControlSocket.cpp:1050 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4246 #, c-format -msgid "Connecting to %s through proxy" -msgstr "A ligar a %s através do proxy" +msgid "Connecting to %s through %s proxy" +msgstr "A ligar a %s via o proxy %s" -#: ../../locales/../src/engine/ControlSocket.cpp:956 -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/ControlSocket.cpp:958 +#: ../../locales/../src/engine/proxy.cpp:243 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:370 #, c-format msgid "Connecting to %s..." @@ -2322,178 +2353,183 @@ msgid "Connection" msgstr "Ligação" -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Connection aborted" msgstr "Ligação terminada" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:327 msgid "Connection attempt failed" msgstr "Falhou a tentativa de ligação" -#: ../../locales/../src/engine/ControlSocket.cpp:921 -#: ../../locales/../src/engine/proxy.cpp:200 +#: ../../locales/../src/engine/ControlSocket.cpp:922 +#: ../../locales/../src/engine/proxy.cpp:217 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:927 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Falhou a tentativa de ligação com \"%s\"." -#: ../../locales/../src/engine/ControlSocket.cpp:181 -#: ../../locales/../src/engine/engineprivate.cpp:677 +#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Tentativa de ligação interrompida pelo utilizador" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "Connection attempt timed out" msgstr "A tentativa de ligação excedeu o tempo" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:559 msgid "Connection closed" msgstr "Ligação terminada" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231 +#: ../../locales/../src/engine/ControlSocket.cpp:1017 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 msgid "Connection closed by server" msgstr "Ligação terminada pelo servidor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:368 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 msgid "Connection established, initializing TLS..." msgstr "Ligação estabelecida, a iniciar o TLS ..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 msgid "Connection established, sending HTTP request" msgstr "Ligação estabelecida, a enviar o pedido HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:396 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:412 msgid "Connection established, waiting for welcome message..." msgstr "Ligação estabelecida, à espera da mensagem de boas-vindas ..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:354 msgid "Connection lost" msgstr "Ligação perdida" -#: ../../locales/../src/engine/proxy.cpp:470 +#: ../../locales/../src/engine/proxy.cpp:487 msgid "Connection not allowed by ruleset" msgstr "Ligação não permitida pelo conjunto de regras" -#: ../../locales/../src/engine/proxy.cpp:479 +#: ../../locales/../src/engine/proxy.cpp:496 msgid "Connection refused" msgstr "Ligação recusada" -#: ../../locales/../src/engine/socket.cpp:1040 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection refused by server" msgstr "Ligação recusada pelo servidor" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Connection reset by network" msgstr "Ligação redefinida pelo servidor" -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "Connection reset by peer" msgstr "Ligação redefinida pelo servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:558 +#: ../../locales/../src/engine/ControlSocket.cpp:559 #, 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:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1077 msgid "Connection timed out." msgstr "Ligação terminada." -#: ../../locales/../src/interface/search.cpp:358 +#: ../../locales/../src/interface/search.cpp:383 msgid "Connection to server lost." msgstr "Perdida a ligação ao servidor." -#: ../../locales/../src/engine/proxy.cpp:209 +#: ../../locales/../src/engine/proxy.cpp:226 msgid "Connection with proxy established, performing handshake..." msgstr "Ligação estabelecida com o proxy, a saudar ..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "Connection with server got closed prematurely." msgstr "A ligação ao servidor terminou prematuramente." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:568 msgid "Connection with the test server failed." msgstr "A ligação ao servidor de teste falhou." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:276 -msgid "Convert keyfile" -msgstr "Converter a chave do ficheiro" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +msgid "Convert key file" +msgstr "Converter o ficheiro chave" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:642 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1849 #, 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:605 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1829 #, 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:516 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:170 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, 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:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:545 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 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:823 +#: ../../locales/../src/interface/state.cpp:757 msgid "Could not complete operation" msgstr "Não foi possível terminar a operação" -#: ../../locales/../src/engine/ControlSocket.cpp:183 +#: ../../locales/../src/engine/ControlSocket.cpp:186 msgid "Could not connect to server" msgstr "Não foi possível ligar ao servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1087 #, c-format msgid "Could not connect to server: %s" msgstr "Não foi possível ligar ao servidor: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 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:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 msgid "Could not convert private key" msgstr "Não foi possível converter a chave privada" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/RemoteListView.cpp:2532 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 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:522 +#: ../../locales/../src/interface/updater.cpp:458 #, c-format msgid "Could not create local file %s\n" msgstr "Não foi possível criar o ficheiro local %s\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:864 +#: ../../locales/../src/engine/logging.cpp:165 +#, 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 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 " @@ -2503,11 +2539,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:4175 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 msgid "Could not establish connection to server" msgstr "Impossível establecer a ligação com o servidor" -#: ../../locales/../src/interface/FileZilla.cpp:481 +#: ../../locales/../src/interface/FileZilla.cpp:406 msgid "" "Could not find the resource files for FileZilla, closing FileZilla.\n" "You can set the data directory of FileZilla using the '--datadir " @@ -2523,7 +2559,7 @@ 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:937 +#: ../../locales/../src/engine/tlssocket.cpp:956 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2531,7 +2567,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:914 +#: ../../locales/../src/engine/tlssocket.cpp:933 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2539,27 +2575,27 @@ "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:976 +#: ../../locales/../src/interface/state.cpp:929 msgid "Could not get full remote path." msgstr "Não é possível obter o caminho remoto completo." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:154 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:171 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:237 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:251 msgid "Could not get reply from fzputtygen." msgstr "Não foi possível obter uma resposta do fzputtygen." -#: ../../locales/../src/interface/edithandler.cpp:1609 -#: ../../locales/../src/interface/search.cpp:687 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/search.cpp:712 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:860 +#: ../../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:855 +#: ../../locales/../src/engine/tlssocket.cpp:874 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2567,8 +2603,8 @@ "Não foi possível iniciar a estrutura para os certificados de ponto, o módulo " "'gnutls_x509_crt_init' falhou" -#: ../../locales/../src/interface/import.cpp:98 -#: ../../locales/../src/interface/import.cpp:284 +#: ../../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 " @@ -2579,15 +2615,15 @@ "e pode ser acedido.\n" "Qualquer alteração feita ao Gestor de Sítios não será guardada." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:227 -msgid "Could not load keyfile" -msgstr "Não foi possível carregar a chave de ficheiro" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Não foi possível carregar o ficheiro chave" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:301 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 msgid "Could not load private key" msgstr "Não foi possível carregar a chave privada" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:951 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2598,7 +2634,7 @@ "Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/state.cpp:391 +#: ../../locales/../src/interface/state.cpp:361 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2608,7 +2644,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:292 +#: ../../locales/../src/interface/state.cpp:266 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2618,20 +2654,20 @@ "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:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1420 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2532 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1374 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:172 -#: ../../locales/../src/engine/logging.cpp:204 +#: ../../locales/../src/engine/logging.cpp:177 +#: ../../locales/../src/engine/logging.cpp:208 #, 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:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Impossível analisar o caminho remoto." @@ -2639,43 +2675,43 @@ msgid "Could not parse server address:" msgstr "Impossível analisar o endereço do servidor:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:222 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 #, c-format msgid "Could not read from socket: %s" msgstr "Não foi possível ler do ponto: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Não foi possível ler o item do servidor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2654 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 #, 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:2566 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2502 msgid "Could not seek to the end of the file" msgstr "Impossível procurar o término do ficheiro" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:140 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:224 msgid "Could not send command to fzputtygen." msgstr "Não foi possível enviar o comando para o fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2682 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2623 msgid "Could not spawn IO thread" msgstr "Impossível criar o processo IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1064 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Não foi possível saudar o proxy: %s" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Could not start transfer" msgstr "Impossível iniciar a transferência" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2684,19 +2720,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:836 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 #, 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:324 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 #, 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:1859 +#: ../../locales/../src/interface/QueueView.cpp:1850 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2705,42 +2741,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.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 #, 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:125 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "Incapaz de escrever \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:324 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 #, c-format -msgid "Could not write keyfile: %s" -msgstr "Não foi possível escrever a chave de ficheiro: %s" +msgid "Could not write key file: %s" +msgstr "Não foi possível escrever o ficheiro chave: %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Could not write to local file" msgstr "Não foi possível esvrever para o ficheiro local" -#: ../../locales/../src/engine/logging.cpp:212 -#: ../../locales/../src/engine/logging.cpp:277 +#: ../../locales/../src/engine/logging.cpp:215 +#: ../../locales/../src/engine/logging.cpp:280 #, 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:881 -#: ../../locales/../src/engine/ControlSocket.cpp:984 +#: ../../locales/../src/engine/ControlSocket.cpp:882 +#: ../../locales/../src/engine/ControlSocket.cpp:986 #, 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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "País" @@ -2748,17 +2784,25 @@ msgid "Crea&te new file" msgstr "Criar um &novo ficheiro" +#: ../../locales/../src/interface/state.cpp:965 +msgid "Create &missing local directory and enter it" +msgstr "Criar a pasta local em &falta e abri-la" + +#: ../../locales/../src/interface/state.cpp:892 +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:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../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 "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:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../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 "Criar uma nova subpasta na pasta actual e abri-la" @@ -2768,50 +2812,50 @@ #: ../../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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Create director&y and enter it" msgstr "Criar &pasta e abri-la" #: ../../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/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1297 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 msgid "Create directory" msgstr "Criar pasta" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2619 msgid "Create empty file" msgstr "Criar um ficheiro vazio" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Creating directory" msgstr "A criar a pasta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3234 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1955 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3170 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 #, c-format msgid "Creating directory '%s'..." msgstr "A criar a pasta '%s' ..." -#: ../../locales/../src/engine/ControlSocket.cpp:176 +#: ../../locales/../src/engine/ControlSocket.cpp:179 msgid "Critical error" msgstr "Erro crítico" -#: ../../locales/../src/engine/ControlSocket.cpp:167 +#: ../../locales/../src/engine/ControlSocket.cpp:170 msgid "Critical error:" msgstr "Erro crítico:" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:134 msgid "Critical file transfer error" msgstr "Erro crítico na transferência do ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:116 +#: ../../locales/../src/engine/ControlSocket.cpp:119 #, 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:382 +#: ../../locales/../src/interface/state.cpp:352 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2820,18 +2864,22 @@ "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:391 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "O tipo de transferência actual está definido para ASCII." -#: ../../locales/../src/interface/statusbar.cpp:399 +#: ../../locales/../src/interface/statusbar.cpp:401 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:395 +#: ../../locales/../src/interface/statusbar.cpp:397 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 +msgid "Curve:" +msgstr "Curva:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:478 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1556 msgid "Cus&tom" @@ -2841,12 +2889,12 @@ msgid "Custom filter set" msgstr "Conjunto de filtros personalizado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../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:2483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Tipo de D&ados" @@ -2854,17 +2902,21 @@ 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:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "P&redefinição" #: ../../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:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 msgid "D&elete" msgstr "A&pagar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Compa&ração de pastas" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "D&esactivar tudo" @@ -2876,8 +2928,8 @@ msgid "D&ouble-click action on directories:" msgstr "Acçã&o para o clique duplo nas pastas:" -#: ../../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:2842 msgid "D&uplicate" msgstr "D&uplicar" @@ -2885,16 +2937,16 @@ msgid "DOS-like with virtual paths" msgstr "Como em DOS com caminhos virtuais" -#: ../../locales/../src/interface/edithandler.cpp:1661 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Tipo de ficheiro 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:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:994 +#: ../../locales/../src/interface/netconfwizard.cpp:1058 msgid "Data socket closed too early." msgstr "Ponto de dados fechado prematuramente." @@ -2922,7 +2974,7 @@ msgid "Debugging settings" msgstr "Configurações para corrigir erros" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Pasta &local predefinida:" @@ -2934,17 +2986,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:1362 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1432 +#: ../../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 "O ficheiro existe no destino" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "Pasta &remota predefinida:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../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." @@ -2954,7 +3006,7 @@ #: ../../locales/../src/interface/settings/optionspage_language.cpp:71 msgid "Default system language" -msgstr "Linguagem predefinida do sistema" +msgstr "Idioma indicado pelo sistema" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" @@ -2976,7 +3028,7 @@ "O tempo de espera entre tentativas de ligação falhadas tem de ser entre 1 e " "999 segundos." -#: ../../locales/../src/engine/engineprivate.cpp:519 +#: ../../locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2989,12 +3041,12 @@ msgstr[1] "" "A atrasar a ligação por %d segundos devido a uma tentativa prévia falhada ..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" msgstr "Apagar a entrada no Gestor de Sítios" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" msgstr "Apagar a pasta seleccionada" @@ -3003,47 +3055,52 @@ msgid "Delete selected files and directories" msgstr "Apagar os ficheiros e as pastas seleccionados" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:365 #, c-format msgid "Deleting \"%s\"" msgstr "A apagar \"%s\"" -#: ../../locales/../src/engine/engineprivate.cpp:367 +#: ../../locales/../src/engine/engineprivate.cpp:368 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "A apagar %u ficheiros de \"%s\"" -#: ../../locales/../src/interface/search.cpp:728 +#: ../../locales/../src/interface/search.cpp:753 msgid "Deleting directories" msgstr "A apagar as pastas" -#: ../../locales/../src/interface/search.cpp:728 +#: ../../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:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "A apagar a ligação simbólica" -#: ../../locales/../src/interface/LocalTreeView.cpp:983 +#: ../../locales/../src/interface/LocalTreeView.cpp:958 msgid "Desktop" msgstr "Ambiente de trabalho" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:42 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:851 msgid "Details" msgstr "Detalhes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Detalhes para a nova chave:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +msgid "Detected newer version of FileZilla" +msgstr "Encontrada uma nova versão do FileZilla" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "Past&as" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Direction" msgstr "Direcção" @@ -3051,17 +3108,17 @@ msgid "Directory" msgstr "Pasta" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../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:464 -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/filelistctrl.cpp:463 +#: ../../locales/../src/interface/Mainfrm.cpp:2165 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 falhada" @@ -3071,39 +3128,39 @@ "A pasta que contém o ficheiro 'logfile' não existe ou o nome do ficheiro é " "inválido." -#: ../../locales/../src/engine/ControlSocket.cpp:187 +#: ../../locales/../src/engine/ControlSocket.cpp:190 msgid "Directory listing aborted by user" msgstr "Listagem de pastas abortada pelo utilizador" -#: ../../locales/../src/interface/RemoteListView.cpp:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2023 msgid "Directory listing failed" msgstr "Listagem de pastas falhada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Filtros da lista de pastas" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:198 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Listagem de pastas de \"%s\" bem sucedida" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:195 msgid "Directory listing successful" msgstr "Listagem de pastas bem sucedida" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" msgstr "Desa&ctivar tudo" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:958 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:673 +#: ../../locales/../src/interface/Mainfrm.cpp:649 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3115,23 +3172,23 @@ msgid "Disconnect from server" msgstr "Desligar do servidor" -#: ../../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: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 msgid "Disconnected from server" msgstr "Desligado do servidor" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../locales/../src/engine/ControlSocket.cpp:1019 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:895 #, c-format msgid "Disconnected from server: %s" msgstr "Desligado do servidor: %s" -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:324 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "A desligar do servidor anterior" @@ -3152,13 +3209,13 @@ msgid "Do ¬hing" msgstr "Não &fazer nada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../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 "Fazer o mesmo a todos os ficheiros seleccionados já em edição" -#: ../../locales/../src/interface/Mainfrm.cpp:1176 -#: ../../locales/../src/interface/Mainfrm.cpp:1198 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "Do you really want to close FileZilla?" msgstr "Quer mesmo sair do FileZilla?" @@ -3173,7 +3230,7 @@ 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:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Quer mesmo apagar a entrada seleccionada?" @@ -3181,16 +3238,16 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Quer mesmo apagar a lista de transferências?" -#: ../../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 "Quer mesmo enviar '%s' para o servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 msgid "Do you want to reopen this file?" msgstr "Quer reabrir este ficheiro?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Documentação" @@ -3208,31 +3265,31 @@ msgid "Double-click action" msgstr "Acção por clique duplo do rato" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Transferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Limite em &descarga" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "Limite para &descarga: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "Limite para &descarga: nenhum" -#: ../../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:3110 +#: ../../locales/../src/interface/search.cpp:518 +#: ../../locales/../src/interface/search.cpp:523 msgid "Download search results" msgstr "Transferir os resultados da procura" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Transferir a pasta seleccionada" @@ -3240,7 +3297,7 @@ msgid "Download selected files and directories" msgstr "Transferir os ficheiros e as pastas seleccionados" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:965 #, c-format msgid "" "Download speed: %s/s\n" @@ -3249,21 +3306,21 @@ "Velocidade de descarga: %s/s\n" "Velocidade de envio: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1115 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "A transferir" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 #, c-format msgid "Downloading %s" msgstr "A transferir %s" -#: ../../locales/../src/interface/search.cpp:590 +#: ../../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:590 +#: ../../locales/../src/interface/search.cpp:615 msgid "Downloading search results" msgstr "A transferir os resultados da procura" @@ -3272,10 +3329,10 @@ msgstr "A transferir a actualização ..." #: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 +#: ../../locales/../src/interface/LocalTreeView.cpp:109 #: ../../locales/../src/interface/QueueView.cpp:87 #: ../../locales/../src/interface/RemoteListView.cpp:102 -#: ../../locales/../src/interface/RemoteTreeView.cpp:87 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" "Drag&drop between different instances of FileZilla has not been implemented " "yet." @@ -3284,10 +3341,10 @@ "implementado." #: ../../locales/../src/interface/LocalListView.cpp:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 +#: ../../locales/../src/interface/LocalTreeView.cpp:115 #: ../../locales/../src/interface/QueueView.cpp:100 #: ../../locales/../src/interface/RemoteListView.cpp:108 -#: ../../locales/../src/interface/RemoteTreeView.cpp:93 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." msgstr "" "O 'arrastar e largar' entre servidores diferentes ainda não foi implementado." @@ -3296,7 +3353,7 @@ msgid "Dupl&icate" msgstr "Dupl&icar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" msgstr "A&ctivar tudo" @@ -3313,15 +3370,21 @@ msgid "E&xit" msgstr "S&air" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../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 "E&xportar ..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:250 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 necessita de pelo menos uma condição." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" msgstr "Editar filtros" @@ -3332,16 +3395,16 @@ "Editar o ficheiro com o editor configurado e enviar as mudanças para o " "servidor." -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:700 msgid "Editing directories is not supported" msgstr "Editar diretórios não é suportado" -#: ../../locales/../src/interface/LocalListView.cpp:1594 -#: ../../locales/../src/interface/LocalListView.cpp:1603 +#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1591 msgid "Editing failed" msgstr "Falhou a edição" -#: ../../locales/../src/interface/search.cpp:675 +#: ../../locales/../src/interface/search.cpp:700 msgid "Editing search results" msgstr "A editar os resultados da busca" @@ -3349,7 +3412,7 @@ msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:2123 msgid "Empty command" msgstr "Limpar comando" @@ -3357,7 +3420,7 @@ msgid "Empty command." msgstr "Comando vazio." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2025 msgid "Empty directory listing" msgstr "Limpar lista de pastas" @@ -3383,7 +3446,7 @@ msgid "Empty quoted string." msgstr "Limpar as chaves guardadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" msgstr "Ac&tivar tudo" @@ -3395,15 +3458,15 @@ msgid "Encrypted" msgstr "Encriptado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Encriptação" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Detalhes da encriptação" -#: ../../locales/../src/interface/filelistctrl.cpp:466 +#: ../../locales/../src/interface/filelistctrl.cpp:465 msgid "End comparison and change sorting order?" msgstr "Terminar comparação e alterar a ordenação?" @@ -3411,15 +3474,15 @@ msgid "Enter &custom command..." msgstr "Indicar comando &personalizado ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Indique 0 para velocidade ilimitada." -#: ../../locales/../src/interface/QueueView.cpp:2133 +#: ../../locales/../src/interface/QueueView.cpp:2112 msgid "Enter command" msgstr "Indicar comando" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:571 msgid "Enter custom command" msgstr "Indicar comando personalizado" @@ -3433,11 +3496,11 @@ msgid "Enter filter name" msgstr "Indique o nome do filtro" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:333 msgid "Enter name for filterset" msgstr "Indique um nome para o conjunto de filtros" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:391 msgid "Enter new name for filterset" msgstr "Indique um novo nome para o conjunto de filtros" @@ -3479,15 +3542,14 @@ "- ftps:// para FTP sobre TLS (implícito)\n" "- ftpes:// para FTP sobre TLS (explícito)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 #, 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 "" "Indique a palavra-passe para o ficheiro '%s'.\n" -"Por favor tenha em atenção que o ficheiro convertido não estará protegido " -"por palavra-passe." +"O ficheiro convertido estará protegido com a mesma palavra-passe." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3497,7 +3559,7 @@ "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:61 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Indique o nome de utilizador e a palavra-passe" @@ -3506,63 +3568,63 @@ msgstr "Erro ao exportar as configurações" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Erro ao importar" -#: ../../locales/../src/interface/QueueView.cpp:1926 +#: ../../locales/../src/interface/QueueView.cpp:1912 msgid "Error loading queue" msgstr "Erro ao ler a lista" -#: ../../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/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:1842 -#: ../../locales/../src/interface/search.cpp:798 -#: ../../locales/../src/interface/search.cpp:817 +#: ../../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: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/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 msgid "Error loading xml file" msgstr "Erro ao carregar ficheiro xml" -#: ../../locales/../src/interface/QueueView.cpp:1831 +#: ../../locales/../src/interface/QueueView.cpp:1822 msgid "Error saving queue" msgstr "Erro ao guardar a lista" -#: ../../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:203 msgid "Error starting program" msgstr "Erro ao iniciar o programa" -#: ../../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/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.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/sitemanager_dialog.cpp:830 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2224 +#: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Erro ao escrever ficheiro xml" #: ../../locales/../src/engine/logging.cpp:110 -#: ../../locales/../src/interface/StatusView.cpp:274 -#: ../../locales/../src/interface/StatusView.cpp:328 +#: ../../locales/../src/interface/StatusView.cpp:281 +#: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" msgstr "Erro:" @@ -3588,19 +3650,19 @@ msgid "Explorer" msgstr "Explorador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" msgstr "Exportar &Lista" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" msgstr "Exportar &Configurações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Exportar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "F&iltrar nome:" @@ -3608,7 +3670,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - Protocolo de Transferência de Ficheiros" @@ -3621,7 +3683,7 @@ msgstr "FTP - Protocolo de Transferência de Ficheiros Inseguro" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "Motor de FTP ainda não iniciado, não é possivel a ligação" @@ -3657,66 +3719,66 @@ #: ../../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/LocalTreeView.cpp:871 -#: ../../locales/../src/interface/LocalTreeView.cpp:1124 -#: ../../locales/../src/interface/viewheader.cpp:507 +#: ../../locales/../src/interface/LocalListView.cpp:1778 +#: ../../locales/../src/interface/LocalTreeView.cpp:846 +#: ../../locales/../src/interface/LocalTreeView.cpp:1099 +#: ../../locales/../src/interface/viewheader.cpp:504 msgid "Failed to change directory" msgstr "Falhou a mudança de pasta" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../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 msgid "Failed to change language" -msgstr "Falhou a alteração de linguagem" +msgstr "Falhou a alteração do idioma" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 msgid "Failed to copy or move sites" msgstr "Falhou a cópia ou o mover dos sítios" -#: ../../locales/../src/interface/xmlfunctions.cpp:466 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 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:802 +#: ../../locales/../src/interface/netconfwizard.cpp:803 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:4154 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 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:629 +#: ../../locales/../src/interface/LocalTreeView.cpp:625 msgid "Failed to get 'My Documents' path" msgstr "Falhou a obtenção do caminho para 'Os meus documentos'" -#: ../../locales/../src/interface/LocalTreeView.cpp:617 +#: ../../locales/../src/interface/LocalTreeView.cpp:613 msgid "Failed to get desktop path" msgstr "Falhou a obtenção do caminho para o ambiente de trabalho" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:961 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Falhou a obtenção do endereço do ponto da conexão de controlo, ligação " "terminada." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:968 msgid "Failed to get peer address of data connection, connection closed." msgstr "" "Falhou a obtenção do endereço do ponto da conexão de dados, ligação " "terminada." -#: ../../locales/../src/interface/context_control.cpp:82 +#: ../../locales/../src/interface/context_control.cpp:80 msgid "Failed to initialize FTP engine" msgstr "Falhou a iniciação de um motor FTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:376 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:301 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:754 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 msgid "Failed to initialize TLS." msgstr "Falhou a iniciação do TLS" @@ -3724,121 +3786,121 @@ msgid "Failed to load panels, invalid resource files?" msgstr "Falhou a carga dos painéis, ficheiros de recursos inválidos?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 #, c-format msgid "Failed to load private key: %s" msgstr "Falha ao carregar a chave privada: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2492 #, 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:2622 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Falhou a abertura de \"%s\" para leitura" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2588 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2524 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Falhou a abertura de \"%s\" para escrita" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:346 msgid "Failed to parse returned path." msgstr "Falhou a análise do caminho devolvido." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1023 msgid "Failed to receive data" msgstr "Falhou a recepção de dados" -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:192 msgid "Failed to retrieve directory listing" msgstr "Falhou a obtenção da lista de pastas" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:731 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:3865 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 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:3886 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 msgid "Failed to retrieve local ip address." msgstr "Falhou a obtenção de um endereço IP local" -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../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:631 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Failed to retrieve the external IP address." msgstr "Falhou a obtenção de um endereço IP externo." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:323 msgid "Failed to send command." msgstr "Falhou o envio do comando." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:152 #, c-format msgid "Failed to set language to %s (%s), using default system language" msgstr "" -"Falhou a definição da linguagem para %s (%s), a utilizar a linguagem " -"predefinida do sistema" +"Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " +"sistema" -#: ../../locales/../src/interface/FileZilla.cpp:192 +#: ../../locales/../src/interface/FileZilla.cpp:130 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." msgstr "" -"Falhou a definição da linguagem para %s (%s), a utilizar a linguagem " -"predefinida do sistema %s (%s)." +"Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " +"sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:119 #, c-format msgid "Failed to set language to %s (%s), using default system language." msgstr "" -"Falhou a definição da linguagem para %s (%s), a utilizar a linguagem " -"predefinida do sistema." +"Falhou a definição do idioma para %s (%s), a utilizar o idioma indicado pelo " +"sistema." -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../locales/../src/interface/FileZilla.cpp:154 #: ../../locales/../src/interface/settings/optionspage_language.cpp:51 #, c-format msgid "Failed to set language to %s, using default system language" msgstr "" -"Falhou a definição de uma linguagem para %s, a utilizar a linguagem " -"predefinida do sistema" +"Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " +"sistema" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:126 #, c-format msgid "Failed to set language to %s, using default system language (%s, %s)." msgstr "" -"Falhou a definição da linguagem para %s, a utilizar a linguagem predefinida " -"do sistema (%s, %s)." +"Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " +"sistema (%s, %s)." -#: ../../locales/../src/interface/FileZilla.cpp:178 +#: ../../locales/../src/interface/FileZilla.cpp:116 #, c-format msgid "Failed to set language to %s, using default system language." msgstr "" -"Falhou a definição da linguagem para %s, a utilizar a linguagem predefinida " -"do sistema." +"Falhou a definição do idioma para %s, a utilizar o idioma indicado pelo " +"sistema." #: ../../locales/../src/interface/settings/optionspage.cpp:215 msgid "Failed to validate settings" msgstr "Falhou a validação das configurações" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1105 msgid "Failed to verify peer certificate" msgstr "Falhou a verificação do certificado de ponto" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 #, c-format msgid "Failed to write to file %s" msgstr "Falhou a escrita no ficheiro %s" -#: ../../locales/../src/interface/xmlfunctions.cpp:483 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "Falhou a escrita no ficheiro xml" @@ -3850,11 +3912,11 @@ msgid "Fall back to active mode" msgstr "Retroceder para o modo activo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Fich&eiro:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Fic&heiros" @@ -3866,11 +3928,11 @@ msgid "File Types" msgstr "Tipos de ficheiro" -#: ../../locales/../src/engine/socket.cpp:1045 +#: ../../locales/../src/engine/socket.cpp:1065 msgid "File descriptor not a socket" msgstr "Descritor de ficheiro não é um socket" -#: ../../locales/../src/interface/import.cpp:88 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "O ficheiro não contém qualquer dado que possa ser importado." @@ -3878,7 +3940,7 @@ msgid "File editing" msgstr "Edição do ficheiro" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1603 msgid "File exists" msgstr "O ficheiro existe" @@ -3886,7 +3948,7 @@ msgid "File exists action" msgstr "O ficheiro existe" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "O ficheiro foi alterado" @@ -3894,9 +3956,9 @@ msgid "File lists" msgstr "Listas de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1585 -#: ../../locales/../src/interface/FileZilla.cpp:671 -#: ../../locales/../src/interface/FileZilla.cpp:756 +#: ../../locales/../src/interface/edithandler.cpp:1550 +#: ../../locales/../src/interface/FileZilla.cpp:596 +#: ../../locales/../src/interface/FileZilla.cpp:681 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:124 msgid "File not found" msgstr "Ficheiro não encontrado" @@ -3905,54 +3967,54 @@ msgid "File search" msgstr "Procura de ficheiro" -#: ../../locales/../src/engine/ControlSocket.cpp:123 +#: ../../locales/../src/engine/ControlSocket.cpp:126 msgid "File transfer aborted by user" msgstr "Transferência interrompida pelo utilizador" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:117 #, 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:133 +#: ../../locales/../src/engine/ControlSocket.cpp:136 msgid "File transfer failed" msgstr "Transferência falhada" -#: ../../locales/../src/engine/ControlSocket.cpp:118 +#: ../../locales/../src/engine/ControlSocket.cpp:121 #, 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:128 +#: ../../locales/../src/engine/ControlSocket.cpp:131 msgid "File transfer skipped" msgstr "Transferências ignoradas" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:129 msgid "File transfer successful" msgstr "Transferência do ficheiro bem sucedida" -#: ../../locales/../src/engine/ControlSocket.cpp:111 +#: ../../locales/../src/engine/ControlSocket.cpp:114 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Transferência bem sucedida, tranferidos %s in %s" -#: ../../locales/../src/interface/Mainfrm.cpp:1175 +#: ../../locales/../src/interface/Mainfrm.cpp:1136 msgid "File transfers still in progress." msgstr "Transferência ainda a decorrer." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 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:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 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:482 +#: ../../locales/../src/interface/FileZilla.cpp:407 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "Erro do FileZilla" @@ -3964,15 +4026,15 @@ "O FileZilla pode testar a sua configuração agora para certificar-se que está " "tudo correctamente configurado." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "O FileZilla já está ligado a um servidor." -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1440 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 de " -"linguagem." +"O FileZilla tem de ser reiniciado para que tenha efeito a alteração do " +"idioma." #: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" @@ -3982,12 +4044,12 @@ msgid "Filelist status &bars" msgstr "&Barras de estado das listas de ficheiros" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../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:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/RemoteListView.cpp:373 +#: ../../locales/../src/interface/search.cpp:108 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Nome" @@ -3995,33 +4057,33 @@ msgid "Filename &filters..." msgstr "&Filtros ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3038 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2216 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 #, 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:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1589 msgid "Filename invalid" msgstr "Nome de ficheiro inválido" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Nome de ficheiro não modificado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 #: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Nome do ficheiro:" -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:318 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:292 +#: ../../locales/../src/interface/file_utils.cpp:293 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" @@ -4029,14 +4091,14 @@ "Os nomes de ficheiro não podem conter quaisquer dos seguintes caracteres: / " "\\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 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:375 -#: ../../locales/../src/interface/search.cpp:82 +#: ../../locales/../src/interface/RemoteListView.cpp:374 +#: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" msgstr "Tamanho" @@ -4045,8 +4107,8 @@ msgstr "Formato do tamanho de ficheiro" #: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/RemoteListView.cpp:375 +#: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" msgstr "Tipo" @@ -4055,7 +4117,7 @@ msgid "Filetype associations" msgstr "Associações dos tipos de ficheiros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "O filtro aplica-se a:" @@ -4066,24 +4128,24 @@ #: ../../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 "Este nome de filtro já existe" -#: ../../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 "As saídas do filtro correspondem a todos os seguintes" -#: ../../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 "As saídas do filtro não correspondem a quaisquer dos seguintes" -#: ../../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 "As saídas do filtro não correspondem a nenhum dos seguintes" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:353 +#: ../../locales/../src/interface/filter.cpp:409 msgid "Filter set already exists" msgstr "Este conjunto de filtros já existe" @@ -4091,17 +4153,17 @@ msgid "Filter the directory listings" msgstr "Filtrar as listas de pastas" -#: ../../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 "Falhou a validação do filtro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Procurar &ficheiros" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Procurar &pastas" @@ -4113,12 +4175,12 @@ msgid "Fingerprint (SHA-256):" msgstr "Impressão digital (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 "Impressão digital:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:58 msgid "Firewall and router configuration wizard" msgstr "Assistente de configuração de firewall e router" @@ -4142,7 +4204,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:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "Forçar ao &UTF-8" @@ -4150,7 +4212,7 @@ msgid "Force showing &hidden files" msgstr "Forçar a mostra de &ficheiros escondidos" -#: ../../locales/../src/interface/Mainfrm.cpp:668 +#: ../../locales/../src/interface/Mainfrm.cpp:644 msgid "Force showing hidden files" msgstr "Forçar a mostra de ficheiros escondidos" @@ -4163,12 +4225,12 @@ 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:710 +#: ../../locales/../src/interface/updater.cpp:646 #, c-format msgid "Found new %s %s\n" msgstr "Procurar novo %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Documentação adicional" @@ -4176,7 +4238,7 @@ msgid "General" msgstr "Geral" -#: ../../locales/../src/engine/proxy.cpp:467 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "General SOCKS server failure" msgstr "Falha geral do servidor de SOCKS" @@ -4189,37 +4251,37 @@ 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:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Obtendo ajuda" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:353 +#: ../../locales/../src/interface/filter.cpp:409 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:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Marcadores universais" -#: ../../locales/../src/engine/tlssocket.cpp:185 +#: ../../locales/../src/engine/tlssocket.cpp:210 #, c-format msgid "GnuTLS error %d" msgstr "Erro GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:187 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d in %s" msgstr "Erro GnuTLS %d em %s" -#: ../../locales/../src/engine/tlssocket.cpp:181 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Erro GnuTLS %d em %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:179 +#: ../../locales/../src/engine/tlssocket.cpp:204 #, c-format msgid "GnuTLS error %d: %s" msgstr "Erro GnuTLS %d: %s" @@ -4240,7 +4302,7 @@ 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:2016 msgid "Hash:" msgstr "Mistura:" @@ -4249,13 +4311,13 @@ msgstr "Escondido" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:905 +#: ../../locales/../src/interface/queue.cpp:992 msgid "High" msgstr "Alta" -#: ../../locales/../src/interface/queue.cpp:887 -#: ../../locales/../src/interface/queue.cpp:974 +#: ../../locales/../src/interface/queue.cpp:907 +#: ../../locales/../src/interface/queue.cpp:994 msgid "Highest" msgstr "Maior" @@ -4263,7 +4325,7 @@ 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:1135 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1151 msgid "" "Hold the shift key to toggle the filter state on both sides simultaneously." msgstr "" @@ -4274,11 +4336,15 @@ msgid "Homepage:" msgstr "Página oficial:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../locales/../src/engine/socket.cpp:1076 +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:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "A chave do servidor não coincide" @@ -4288,18 +4354,18 @@ "O nome do servidor começa com '[' mas não foi encontrado o parêntesis no " "fecho." -#: ../../locales/../src/engine/proxy.cpp:476 +#: ../../locales/../src/engine/proxy.cpp:493 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: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 "Servidor:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "Horas," @@ -4307,7 +4373,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (exemplo: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:124 +#: ../../locales/../src/engine/proxy.cpp:141 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Não são suportados endereços IPv6 com proxy SOCKS4" @@ -4347,7 +4413,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:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4355,7 +4421,7 @@ "Se não era esperada a mudança na chave do servidor, por favor, contacte o " "administrador." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4363,7 +4429,7 @@ "Se o problema persistir, alguma router e/ou firewall continua a bloquear o " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:579 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4381,7 +4447,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:3186 +#: ../../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." @@ -4389,7 +4455,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:640 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4397,12 +4463,12 @@ "Se este problema persistir, por favor contacte o fabricante do seu router ou " "firewall para uma solução." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:598 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:1441 +#: ../../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 " @@ -4433,7 +4499,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:1197 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "If you close FileZilla, your changes will be lost." msgstr "Se sair do FileZilla as alterações serão perdidas." @@ -4457,7 +4523,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:584 +#: ../../locales/../src/interface/netconfwizard.cpp:585 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 " @@ -4492,7 +4558,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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:611 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4500,16 +4566,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:80 +#: ../../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:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Importar configurações" -#: ../../locales/../src/interface/import.cpp:66 -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:73 +#: ../../locales/../src/interface/import.cpp:76 msgid "Import successful" msgstr "Importação bem sucedida" @@ -4553,7 +4619,7 @@ "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:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1117 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4561,7 +4627,7 @@ "Cadeia incompleta, o certificado de topo não está assinado por uma " "autoridade certificadora" -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:322 msgid "Incorrect password" msgstr "Palavra-passe incorrecta" @@ -4573,16 +4639,20 @@ "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:746 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 msgid "Initializing TLS..." msgstr "A iniciar o TLS ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Algorítmo inseguro!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 msgid "Insecure server, it does not support FTP over TLS." msgstr "Servidor inseguro, não suporta FTP sobre TLS" -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 +#: ../../locales/../src/engine/server.cpp:860 +#: ../../locales/../src/engine/server.cpp:881 #: ../../locales/../src/interface/manual_transfer.cpp:184 msgid "Interactive" msgstr "Interactivo" @@ -4591,29 +4661,29 @@ msgid "Interface" msgstr "Interface" -#: ../../locales/../src/engine/socket.cpp:1042 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Interrupted by signal" msgstr "Interrompido pelo sinal" -#: ../../locales/../src/engine/ControlSocket.cpp:216 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/engine/ControlSocket.cpp:219 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Interrupted by user" msgstr "Interrompido pelo utilizador" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 msgid "Invalid Content-Length" msgstr "Comprimento de conteúdo inválido" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 msgid "Invalid HTTP Response" msgstr "Resposta HTTP inválida" -#: ../../locales/../src/engine/socket.cpp:1030 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Invalid argument passed" msgstr "Argumento inválido transmitido" -#: ../../locales/../src/engine/ControlSocket.cpp:454 -#: ../../locales/../src/engine/ControlSocket.cpp:510 +#: ../../locales/../src/engine/ControlSocket.cpp:455 +#: ../../locales/../src/engine/ControlSocket.cpp:511 msgid "" "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in " "site manager to force UTF-8." @@ -4621,23 +4691,23 @@ "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:851 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 msgid "Invalid chunk size" msgstr "Tamanho inválido" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../locales/../src/interface/netconfwizard.cpp:369 +#: ../../locales/../src/interface/netconfwizard.cpp:379 +#: ../../locales/../src/interface/netconfwizard.cpp:388 msgid "Invalid data received" msgstr "Recebidos dados inválidos" -#: ../../locales/../src/interface/verifycertdialog.cpp:39 -#: ../../locales/../src/interface/verifycertdialog.cpp:52 +#: ../../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:292 -#: ../../locales/../src/interface/file_utils.cpp:317 +#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Invalid filename" msgstr "Nome de ficheiro inválido" @@ -4647,7 +4717,7 @@ "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:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Entrada inválida" @@ -4659,7 +4729,7 @@ "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/interface/quickconnectbar.cpp:121 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4673,42 +4743,42 @@ "ftps:// para FTP sobre TLS (implícito) e\n" "ftpes:// para FTP sobre TLS (explícito)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 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:377 +#: ../../locales/../src/interface/search.cpp:402 msgid "Invalid regular expression in search conditions." msgstr "Expressão regular inválida nas condições para a procura." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:597 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 msgid "Invalid response code" msgstr "Código de resposta inválido" -#: ../../locales/../src/interface/search.cpp:372 +#: ../../locales/../src/interface/search.cpp:397 #, c-format msgid "Invalid search conditions: %s" msgstr "Condições para a procura inválidas: %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: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 "Caminho do sítio inválido" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" msgstr "Tamanho inválido nesta condição" @@ -4716,23 +4786,23 @@ msgid "Invalid username given." msgstr "Nome de utilizador inválido." -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1083 msgid "Invalid value for ai_flags" msgstr "Valor inválido para ai_flags" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1085 msgid "Invalid value for hints" msgstr "Valor inválido para dicas" -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "País de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Localidade de jurisdição:" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Estado ou província de jurisdição:" @@ -4740,7 +4810,7 @@ msgid "Keep directories on top" msgstr "Manter as pastas em cima" -#: ../../locales/../src/interface/Mainfrm.cpp:672 +#: ../../locales/../src/interface/Mainfrm.cpp:648 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 +4821,7 @@ "FilleZilla efectuar alguns testes para verificar se o servidor suporta esta " "funcionalidade, o teste pode falhar." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" msgstr "Troca de chave" @@ -4759,6 +4829,13 @@ 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 +msgid "Key file" +msgstr "Ficheiro chave" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "M&enor" @@ -4766,15 +4843,15 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:1863 #: ../../locales/../src/interface/settings/settingsdialog.cpp:107 msgid "Language" -msgstr "Linguagem" +msgstr "Idioma" -#: ../../locales/../src/interface/Mainfrm.cpp:1505 +#: ../../locales/../src/interface/Mainfrm.cpp:1440 msgid "Language changed" -msgstr "Linguagem alterada" +msgstr "Idioma alterado" #: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/RemoteListView.cpp:376 +#: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" msgstr "Modificado" @@ -4802,7 +4879,7 @@ msgid "Limit:" msgstr "Limite:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 msgid "Line length exceeded" msgstr "Excedido o comprimento da linha" @@ -4810,13 +4887,13 @@ msgid "Linked against" msgstr "Unidos contra" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:283 msgid "Listen socket closed" msgstr "Ponto de supervisão fechado" #: ../../locales/../src/engine/logging.cpp:117 -#: ../../locales/../src/interface/StatusView.cpp:285 -#: ../../locales/../src/interface/StatusView.cpp:356 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "A listar:" @@ -4824,20 +4901,20 @@ msgid "Lo&west available port:" msgstr "Porta &menor disponível:" -#: ../../locales/../src/interface/edithandler.cpp:1148 -#: ../../locales/../src/interface/edithandler.cpp:1402 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Local" -#: ../../locales/../src/engine/socket.cpp:1027 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Local address in use" msgstr "Endereços locais em uso" -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Local endpoint has been closed" msgstr "O ponto de término local foi encerrado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Ficheiro local" @@ -4845,8 +4922,8 @@ msgid "Local file does not exist." msgstr "O ficheiro local não existe." -#: ../../locales/../src/interface/updater.cpp:434 -#: ../../locales/../src/interface/updater.cpp:526 +#: ../../locales/../src/interface/updater.cpp:370 +#: ../../locales/../src/interface/updater.cpp:462 #, c-format msgid "Local file is %s\n" msgstr "O ficheiro local é %s\n" @@ -4859,7 +4936,7 @@ 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:1063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Filtros locais:" @@ -4867,7 +4944,7 @@ msgid "Local site:" msgstr "Endereço local:" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Localidade:" @@ -4880,7 +4957,7 @@ msgid "Logging" msgstr "A iniciar sessão" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Cannot fall back to local charset since using proxy." @@ -4889,7 +4966,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:811 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4897,7 +4974,7 @@ "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:838 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 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 " @@ -4918,13 +4995,13 @@ "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:880 -#: ../../locales/../src/interface/queue.cpp:967 +#: ../../locales/../src/interface/queue.cpp:900 +#: ../../locales/../src/interface/queue.cpp:987 msgid "Low" msgstr "Baixo" -#: ../../locales/../src/interface/queue.cpp:878 -#: ../../locales/../src/interface/queue.cpp:965 +#: ../../locales/../src/interface/queue.cpp:898 +#: ../../locales/../src/interface/queue.cpp:985 msgid "Lowest" msgstr "Menor" @@ -4936,31 +5013,31 @@ msgid "MAC:" msgstr "MAC:" -#: ../../locales/../src/interface/xmlfunctions.cpp:43 +#: ../../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 ficheiro está acessível e de que é um documento XML " "correcto." -#: ../../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/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:840 #, c-format msgid "Malformed chunk data: %s" msgstr "Dados mal formados: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 #, c-format msgid "Malformed header: %s" msgstr "Titulo mal formado: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 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:2557 +#: ../../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 @@ -4972,15 +5049,15 @@ msgid "Manual transfer" msgstr "Transferência manual" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Corresponder a todos os seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Corresponder a qualquer dos seguintes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Corresponder a nenhum dos seguintes" @@ -4988,12 +5065,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Máximo de &transferências simultâneas:" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Memory allocation failure" msgstr "Falha de alocação de memória" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1832 +#: ../../locales/../src/interface/Mainfrm.cpp:387 +#: ../../locales/../src/interface/Mainfrm.cpp:1750 msgid "Message log" msgstr "Janela de mensagens" @@ -5001,7 +5078,7 @@ msgid "Message log position" msgstr "Posição da janela de mensagens" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1072 msgid "Message too large" msgstr "Mensagem demasiado grande" @@ -5009,29 +5086,29 @@ msgid "MiB" msgstr "MiB" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:366 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "Minutos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Mover para &baixo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Mover para &cima" -#: ../../locales/../src/interface/LocalTreeView.cpp:1002 +#: ../../locales/../src/interface/LocalTreeView.cpp:977 msgid "My Computer" msgstr "O meu computador" -#: ../../locales/../src/interface/LocalTreeView.cpp:992 +#: ../../locales/../src/interface/LocalTreeView.cpp:967 msgid "My Documents" msgstr "Os meus documentos" -#: ../../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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Os meus sítios" @@ -5040,22 +5117,21 @@ msgid "N/a" msgstr "N/a" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Nome" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:701 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" msgstr "Este nome já existe" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:816 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 +#: ../../locales/../src/interface/sitemanager.cpp:695 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:749 msgid "Name:" msgstr "Nome:" @@ -5063,23 +5139,23 @@ msgid "Natural sort" msgstr "Ordenação natural" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Tem que indicar o nome do filtro" -#: ../../locales/../src/interface/search.cpp:363 +#: ../../locales/../src/interface/search.cpp:388 msgid "Need to enter valid remote path" msgstr "Tem que indicar um caminho remoto válido" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Tem que especificar a codificação de caracteres" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1093 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:1059 +#: ../../locales/../src/engine/socket.cpp:1080 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5087,8 +5163,8 @@ "O servidor de rede não possui endereços de rede na família de endereços " "requesitados" -#: ../../locales/../src/engine/proxy.cpp:473 -#: ../../locales/../src/engine/socket.cpp:1044 +#: ../../locales/../src/engine/proxy.cpp:490 +#: ../../locales/../src/engine/socket.cpp:1064 msgid "Network unreachable" msgstr "Rede inacessível" @@ -5104,37 +5180,37 @@ msgid "New &tab" msgstr "Novo &separador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../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:2560 +#: ../../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:816 -#: ../../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: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:2180 msgid "New bookmark" msgstr "Novo marcador" -#: ../../locales/../src/interface/LocalTreeView.cpp:1151 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1270 +#: ../../locales/../src/interface/LocalTreeView.cpp:1126 +#: ../../locales/../src/interface/RemoteListView.cpp:1310 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1225 msgid "New directory" msgstr "Nova pasta" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:51 #, c-format msgid "New features and improvements in %s" msgstr "Novas funcionalidades e melhoramentos em %s" @@ -5143,13 +5219,13 @@ msgid "New filter" msgstr "Novo filtro" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" msgstr "Nova pasta" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 msgid "New site" msgstr "Novo sítio" @@ -5157,11 +5233,11 @@ msgid "Next to the transfer queue" msgstr "A seguir à lista de transferências" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 msgid "No" msgstr "Não" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1091 msgid "No address associated with nodename" msgstr "Nenhum endereço associado ao nome do nódulo." @@ -5169,15 +5245,15 @@ msgid "No category to export selected" msgstr "Nenhuma categoria seleccionada para exportar" -#: ../../locales/../src/interface/QueueView.cpp:2144 +#: ../../locales/../src/interface/QueueView.cpp:2123 msgid "No command given, aborting." msgstr "Nenhum comando dado, a abortar." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 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:1089 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Nenhum ficheiro está a ser editado." @@ -5195,86 +5271,86 @@ msgid "No images available" msgstr "Não há imagens disponíveis" -#: ../../locales/../src/interface/QueueView.cpp:3008 +#: ../../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:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:339 +#: ../../locales/../src/interface/filter.cpp:403 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:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Não há programa associado a este tipo de ficheiro." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../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 ficheiros com esta extensão '%s'." -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1067 msgid "No route to host" msgstr "Sem caminho para o servidor" -#: ../../locales/../src/interface/search.cpp:227 +#: ../../locales/../src/interface/search.cpp:255 msgid "No search results" msgstr "Nenhum resultado para a procura" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Não há sítios disponíveis" -#: ../../locales/../src/engine/proxy.cpp:444 +#: ../../locales/../src/engine/proxy.cpp:461 msgid "No supported SOCKS5 auth method" msgstr "O método de autenticação SOCKS5 não é suportado" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 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:58 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Nada" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Nenhum seleccionado" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1087 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:830 -#: ../../locales/../src/engine/server.cpp:849 +#: ../../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:883 -#: ../../locales/../src/interface/queue.cpp:970 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1276 +#: ../../locales/../src/interface/queue.cpp:903 +#: ../../locales/../src/interface/queue.cpp:990 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 msgid "Normal" msgstr "Normal" -#: ../../locales/../src/interface/queueview_failed.cpp:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:312 +#: ../../locales/../src/interface/queueview_failed.cpp:337 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:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:179 +#: ../../locales/../src/interface/state.cpp:482 msgid "Not connected" msgstr "Não ligado" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2021 msgid "Not connected to any server" msgstr "Não ligado a qualquer servidor" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:560 msgid "Not connected to any server." msgstr "Não ligado a qualquer servidor." @@ -5282,11 +5358,11 @@ msgid "Not connected." msgstr "Não ligado." -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1108 msgid "Not initialized, need to call WSAStartup" msgstr "Não inicializado, é necessário chamar WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:670 +#: ../../locales/../src/interface/Mainfrm.cpp:646 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." @@ -5307,39 +5383,43 @@ 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:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 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: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: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 "Versão do SO:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5348,7 +5428,7 @@ "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:834 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 msgid "Once" msgstr "Uma vez" @@ -5360,11 +5440,11 @@ msgid "Once a week" msgstr "Uma vez por semana" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Only use plain FTP (insecure)" msgstr "Usar apenas FTP simples (inseguro)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Abrir pasta no gestor de ficheiros do sistema" @@ -5390,14 +5470,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "Abre a caixa de configurações do FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Aberto como:" -#: ../../locales/../src/interface/edithandler.cpp:1651 -#: ../../locales/../src/interface/edithandler.cpp:1768 +#: ../../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:1719 msgid "Opening failed" msgstr "Falhou a abertura" @@ -5416,27 +5496,23 @@ "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:777 -msgid "Operating system" -msgstr "Sistema operativo" - -#: ../../locales/../src/interface/FileZilla.cpp:306 -msgid "Operating system problem detected" -msgstr "Foi detectado um problema no sistema operativo" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "Sistema Operativo:" -#: ../../locales/../src/engine/socket.cpp:1038 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Operation already in progress" msgstr "Operação já em progresso" -#: ../../locales/../src/engine/socket.cpp:1029 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Operation in progress" msgstr "Operação em progresso" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1070 msgid "Operation not supported" msgstr "Operação não suportada" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Organização:" @@ -5444,16 +5520,16 @@ msgid "Other SFTP options" msgstr "Outras opções SFTP" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1103 msgid "Other system error" msgstr "Outro erro de sistema" -#: ../../locales/../src/interface/verifycertdialog.cpp:237 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Outro:" -#: ../../locales/../src/engine/socket.cpp:1033 -#: ../../locales/../src/engine/socket.cpp:1034 +#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Out of memory" msgstr "Sem memória" @@ -5465,22 +5541,22 @@ msgid "Overwrite &if source newer" msgstr "Substituir &se for mais recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1391 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1414 +#: ../../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 ficheiro" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1393 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1416 +#: ../../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 ficheiro se o tamanho diferir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1394 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1417 +#: ../../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" @@ -5488,8 +5564,8 @@ "Substituir ficheiro se o tamanho diferir ou o ficheiro de origem for mais " "recente" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1392 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1415 +#: ../../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" @@ -5505,7 +5581,7 @@ "Substituir se o ta&manho for diferente ou o ficheiro de origem for mais " "recente" -#: ../../locales/../src/interface/updater.cpp:282 +#: ../../locales/../src/interface/updater.cpp:218 #, c-format msgid "Own build type: %s\n" msgstr "Próprio tipo de compilação: %s\n" @@ -5514,8 +5590,8 @@ msgid "Owner permissions" msgstr "Permissões do proprietário" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:378 +#: ../../locales/../src/interface/search.cpp:114 msgid "Owner/Group" msgstr "Proprietário/Grupo" @@ -5531,7 +5607,7 @@ msgid "P&roxy host:" msgstr "Servidor de p&roxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:504 msgid "PORT command tainted by router or firewall." msgstr "Comando PORT marcado pelo router ou pela firewall." @@ -5539,18 +5615,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivo (recomendado)" -#: ../../locales/../src/interface/Mainfrm.cpp:2401 +#: ../../locales/../src/interface/Mainfrm.cpp:2320 msgid "Parameter not a valid URL" msgstr "O parâmetro não é um caminho URL válido" -#: ../../locales/../src/interface/updater.cpp:606 +#: ../../locales/../src/interface/updater.cpp:542 #, 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:2447 +#: ../../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 "&Palavra-passe:" @@ -5563,39 +5639,39 @@ msgid "Passive mode" msgstr "Modo passivo" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../locales/../src/interface/netconfwizard.cpp:604 +#: ../../locales/../src/interface/netconfwizard.cpp:617 +#: ../../locales/../src/interface/netconfwizard.cpp:628 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/settings/optionspage_connection_sftp.cpp:283 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 msgid "Password required" msgstr "Palavra-passe pedida" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/search.cpp:109 msgid "Path" msgstr "Caminho" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3121 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2258 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 #, 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:2358 +#: ../../locales/../src/interface/Mainfrm.cpp:2278 msgid "Path not found:" msgstr "Caminho não encontrado:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Caminhos" -#: ../../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:1111 +#: ../../locales/../src/interface/edithandler.cpp:1248 +#: ../../locales/../src/interface/edithandler.cpp:1338 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Pending removal" msgstr "Remoção pendente" @@ -5603,13 +5679,13 @@ msgid "Permission" msgstr "Permissões" -#: ../../locales/../src/engine/socket.cpp:1026 -#: ../../locales/../src/engine/socket.cpp:1035 +#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Permission denied" msgstr "Permissão negada" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:377 +#: ../../locales/../src/interface/search.cpp:113 msgid "Permissions" msgstr "Permissões" @@ -5617,7 +5693,7 @@ msgid "Platform:" msgstr "Plataforma:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:569 msgid "" "Please check on https://filezilla-project.org/probe.php that the server is " "running and carefully check your settings again." @@ -5633,13 +5709,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:638 +#: ../../locales/../src/interface/netconfwizard.cpp:639 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:578 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5655,7 +5731,7 @@ msgid "Please enter a custom time format." msgstr "Por favor indique um formato para a hora." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../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 "" @@ -5677,7 +5753,7 @@ 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:391 +#: ../../locales/../src/interface/filter.cpp:389 #, 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\"" @@ -5712,7 +5788,7 @@ msgid "Please enter a password for this server:" msgstr "Por favor indique uma palavra-passe para este servidor:" -#: ../../locales/../src/interface/QueueView.cpp:2133 +#: ../../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" @@ -5729,7 +5805,7 @@ "Por favor insira um tempo de espera entre 10 e 9999 segundos ou 0 para " "nenhum." -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:333 msgid "Please enter a unique name for this filter set" msgstr "Por favor indique um nome único para este conjunto de filtros" @@ -5737,11 +5813,11 @@ msgid "Please enter a username for this server:" msgstr "Por favor indique um nome de utilizador para este servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:198 msgid "Please enter a valid portrange." msgstr "Por favor indique um intervalo de portas válido." -#: ../../locales/../src/interface/netconfwizard.cpp:176 +#: ../../locales/../src/interface/netconfwizard.cpp:177 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." @@ -5751,7 +5827,7 @@ 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." -#: ../../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." @@ -5760,13 +5836,13 @@ "Ao usar comandos ftp brutos limpará o cofre das pastas." #: ../../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/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1297 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 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:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2619 msgid "Please enter the name of the file which should be created:" msgstr "Por favor indique o nome do ficheiro que deve ser criado:" @@ -5776,12 +5852,12 @@ "Por favor indique um nome de utilizador e uma palavra-passe para este " "servidor:" -#: ../../locales/../src/interface/netconfwizard.cpp:157 +#: ../../locales/../src/interface/netconfwizard.cpp:158 msgid "Please enter your external IP address" msgstr "Por favor indique o seu endereço IP externo" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../locales/../src/interface/netconfwizard.cpp:622 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 " @@ -5799,7 +5875,7 @@ "Por favor siga as instruções com cuidado, configurações erradas resultarão " "em ligações FTP falhadas." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "Please make sure FileZilla is allowed to establish outgoing connections and " "make sure you typed the address of the address resolver correctly." @@ -5808,12 +5884,12 @@ "ligações com outros computadores e certifique-se de que está a indicou o " "endereço correcto." -#: ../../locales/../src/interface/FileZilla.cpp:198 +#: ../../locales/../src/interface/FileZilla.cpp:136 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:609 +#: ../../locales/../src/interface/netconfwizard.cpp:610 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 " @@ -5838,7 +5914,7 @@ "malware. Isto poderá levantar um falso alarme que poderá ignorar com " "segurança." -#: ../../locales/../src/interface/Mainfrm.cpp:710 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "" "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES " "servers only works if they support the MFMT command." @@ -5854,7 +5930,7 @@ "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:585 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "" "Please run this wizard again should you change your network environment or " "in case you suddenly encounter problems with servers that did work " @@ -5864,11 +5940,11 @@ "ou em caso de encontrar problemas com servidores que anteriormente " "funcionaram bem." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Por favor seleccione uma acção:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." msgstr "Por favor seleccione as categorias que deseja importar" @@ -5877,33 +5953,33 @@ msgstr "" "Por favor seleccione o modo de transferência predefinido 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 "Por favor seleccione 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 "Por favor seleccione os novos atributos para o ficheiro \"%s\"." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../locales/../src/interface/chmoddialog.cpp:44 msgid "Please select the new attributes for the selected directories." msgstr "Por favor seleccione os novos atributos para as pastas seleccionadas." -#: ../../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 "" "Por favor seleccione os novos atributos para os ficheiros e pastas " "seleccionados." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../locales/../src/interface/chmoddialog.cpp:36 msgid "Please select the new attributes for the selected files." msgstr "" "Por favor seleccione os novos atributos para os ficheiros seleccionados." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../locales/../src/interface/netconfwizard.cpp:597 msgid "" "Please update your firewall and make sure your router is using the latest " "available firmware. Furthermore, your router has to be configured properly. " @@ -5922,8 +5998,8 @@ msgid "Positio&n of the message log:" msgstr "Posição da &janela de mensagens:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 -#: ../../locales/../src/interface/verifycertdialog.cpp:223 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "Código Postal:" @@ -5935,12 +6011,12 @@ msgid "Preallocation" msgstr "Reserva" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 msgid "Predefined Sites" msgstr "Sítios predefinidos" -#: ../../locales/../src/interface/Mainfrm.cpp:709 +#: ../../locales/../src/interface/Mainfrm.cpp:685 msgid "Preserving file timestamps" msgstr "A preservar a data e a hora dos ficheiros" @@ -5948,7 +6024,7 @@ msgid "Preview:" msgstr "Pré-visualizar:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1134 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." @@ -5965,7 +6041,7 @@ msgid "Prioritize directories (default)" msgstr "Pastas prioritárias (predefinição)" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Priority" msgstr "Prioridade" @@ -5995,15 +6071,21 @@ msgid "Process &Queue" msgstr "Processar &Lista" -#: ../../locales/../src/engine/socket.cpp:1031 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "Process file table overflow" msgstr "Tabela de processo de ficheiro transbordou" -#: ../../locales/../src/engine/socket.cpp:1036 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#, c-format +msgid "Processed %s in %s." +msgstr "Processado %s em %s." + +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Protocol not supported" msgstr "Protocolo não suportado" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1110 msgid "Protocol not supported on given socket type" msgstr "Protocolo não suportado no tipo de socket" @@ -6020,38 +6102,38 @@ msgid "Proxy &user:" msgstr "&Utilizador de Proxy:" -#: ../../locales/../src/engine/proxy.cpp:454 +#: ../../locales/../src/engine/proxy.cpp:471 msgid "Proxy authentication failed" msgstr "Falhou a autenticação do proxy." -#: ../../locales/../src/engine/transfersocket.cpp:95 -#: ../../locales/../src/engine/transfersocket.cpp:107 +#: ../../locales/../src/engine/transfersocket.cpp:105 +#: ../../locales/../src/engine/transfersocket.cpp:117 #, c-format msgid "Proxy handshake failed: %s" msgstr "Falhou a saudação do proxy: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 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:312 +#: ../../locales/../src/engine/proxy.cpp:329 #, c-format msgid "Proxy reply: %s" msgstr "Resposta do proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:367 -#: ../../locales/../src/engine/proxy.cpp:495 +#: ../../locales/../src/engine/proxy.cpp:384 +#: ../../locales/../src/engine/proxy.cpp:512 #, c-format msgid "Proxy request failed: %s" msgstr "Falhou o pedido de proxy: %s" -#: ../../locales/../src/engine/proxy.cpp:519 +#: ../../locales/../src/engine/proxy.cpp:536 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:4321 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 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" @@ -6068,22 +6150,22 @@ msgid "Public permissions" msgstr "Permissões públicas" -#: ../../locales/../src/interface/QueueView.cpp:3088 +#: ../../locales/../src/interface/QueueView.cpp:3057 msgid "Queue has been fully processed" msgstr "A lista foi processada totalmente" -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Fila de espera: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:364 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Lista de espera: %s%s" -#: ../../locales/../src/interface/statusbar.cpp:360 -#: ../../locales/../src/interface/statusbar.cpp:418 +#: ../../locales/../src/interface/statusbar.cpp:362 +#: ../../locales/../src/interface/statusbar.cpp:420 msgid "Queue: empty" msgstr "Lista: vazia" @@ -6091,7 +6173,7 @@ msgid "Queued files" msgstr "Ficheiros listados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "A Listar:" @@ -6103,12 +6185,12 @@ msgid "R&emote directory tree" msgstr "Á&rvore de pastas remota" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" msgstr "&Limpar e voltar a listar os ficheiros seleccionados" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:585 msgid "Raw FTP command" msgstr "Comando FTP bruto:" @@ -6125,7 +6207,7 @@ msgid "Re&name" msgstr "Mu&dar o nome" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:592 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6141,12 +6223,12 @@ msgid "Read-only" msgstr "Apenas Leitura" -#: ../../locales/../src/interface/Mainfrm.cpp:1061 +#: ../../locales/../src/interface/Mainfrm.cpp:1022 msgid "Really cancel current operation?" msgstr "Tem a certeza que pretende cancelar a operação actual?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:736 +#: ../../locales/../src/interface/RemoteListView.cpp:1386 +#: ../../locales/../src/interface/search.cpp:761 #, c-format msgid "Really delete %d directory with its contents from the server?" msgid_plural "" @@ -6154,36 +6236,36 @@ 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:1411 -#: ../../locales/../src/interface/search.cpp:734 +#: ../../locales/../src/interface/RemoteListView.cpp:1384 +#: ../../locales/../src/interface/search.cpp:759 #, 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:1418 -#: ../../locales/../src/interface/search.cpp:740 +#: ../../locales/../src/interface/RemoteListView.cpp:1391 +#: ../../locales/../src/interface/search.cpp:765 #, c-format msgid "Really delete %s and %s from the server?" msgstr "Deseja mesmo apagar %s e %s ?" -#: ../../locales/../src/interface/RemoteTreeView.cpp:1072 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1038 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:127 +#: ../../locales/../src/engine/local_filesys.cpp:129 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:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Reason" msgstr "Razão" -#: ../../locales/../src/interface/QueueView.cpp:3081 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Reboot now" msgstr "Reiniciar agora" @@ -6191,36 +6273,36 @@ msgid "Rec&urse into subdirectories" msgstr "Exp&lorar subpastas" -#: ../../locales/../src/engine/tlssocket.cpp:198 +#: ../../locales/../src/engine/tlssocket.cpp:223 #, 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:3021 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2022 -#: ../../locales/../src/engine/directorylistingparser.cpp:2036 +#: ../../locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "Recebida uma linha que excede os 10000 caracteres, a abortar." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:1007 +#: ../../locales/../src/interface/netconfwizard.cpp:1016 +#: ../../locales/../src/interface/netconfwizard.cpp:1039 msgid "Received data tainted" msgstr "Dados marcados recebidos." -#: ../../locales/../src/interface/updater.cpp:585 +#: ../../locales/../src/interface/updater.cpp:521 msgid "Received invalid character in version information" msgstr "Caracteres inválidos recebidos na informação sobre a versão" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:226 #, 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:578 +#: ../../locales/../src/interface/updater.cpp:514 msgid "Received version information is too large" msgstr "A informação sobre a versão recebida é demasiado grande" @@ -6242,13 +6324,25 @@ msgid "Reconnects to the last used server" msgstr "Volta a ligar ao último servidor usado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +msgid "Recursively adding files to queue." +msgstr "A adicionar constantemente ficheiros à lista." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +msgid "Recursively changing permissions." +msgstr "A alterar permissóes constantemente." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +msgid "Recursively deleting files and directories." +msgstr "A apagar constantemente ficheiros e pastas." + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 #, 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:660 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:667 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:656 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Redireccionamento para endereços inválidos ou não suportados: %s" @@ -6258,40 +6352,40 @@ msgid "Refresh the file and folder lists" msgstr "Actualiza as listas de ficheiros e de pastas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Lembrar as palavras-passe?" -#: ../../locales/../src/interface/edithandler.cpp:1111 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" msgstr "Remoto" -#: ../../locales/../src/engine/tlssocket.cpp:833 +#: ../../locales/../src/engine/tlssocket.cpp:852 msgid "Remote certificate not trusted." msgstr "O certificado remoto não é de confiança." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Remote file" msgstr "Ficheiro remoto" -#: ../../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/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 msgid "Remote file search" msgstr "Procura de ficheiros remotos" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Filtros remotos:" -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Caminho remoto" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:424 +#: ../../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 " @@ -6301,7 +6395,7 @@ "caminho absoluto válido e suportado pelo tipo do servidor actual do sítio " "(%s)." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../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 " @@ -6311,9 +6405,9 @@ "caminho absoluto válido e suportado pelo tipo do servidor (%s) seleccionado " "no sítio origem." -#: ../../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: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 "" "Não foi possível analisar o caminho remoto. Certifique-se de que é um " @@ -6323,38 +6417,38 @@ msgid "Remote path could not be parsed." msgstr "Não foi possível analisar o caminho remoto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "A tratar caminho remoto:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Caminho remoto:" -#: ../../locales/../src/interface/viewheader.cpp:533 +#: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" msgstr "Endereço remoto:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" msgstr "Remover &tudo" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" msgstr "Remover &seleccionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1396 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1419 +#: ../../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/asyncrequestqueue.cpp:292 msgid "Rename file" msgstr "Mudar o nome do ficheiro" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:503 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Rename selected directory" msgstr "Mudar o nome da pasta seleccionada" @@ -6363,70 +6457,70 @@ msgid "Rename selected files and directories" msgstr "Mudar o nome aos ficheiros e às pastas seleccionados" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3471 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2457 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Mudar o nome de '%s' para '%s'" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Reportar erros e pedidos de funcionalidades" -#: ../../locales/../src/engine/proxy.cpp:358 +#: ../../locales/../src/engine/proxy.cpp:375 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:361 +#: ../../locales/../src/engine/proxy.cpp:378 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:355 +#: ../../locales/../src/engine/proxy.cpp:372 msgid "Request rejected or failed" msgstr "Pedido rejeitado ou falhado" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "Requer FTP sobre TLS explícito" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "Requer FTP sobre TLS implícito" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" msgstr "Limpar e voltar a listar &todos os ficheiros" -#: ../../locales/../src/engine/socket.cpp:1077 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Resolved protocol is unknown" msgstr "Protocolo desconhecido" -#: ../../locales/../src/engine/ControlSocket.cpp:1079 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1081 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:457 #, c-format msgid "Resolving address of %s" msgstr "A resolver o endereço de %s" -#: ../../locales/../src/engine/socket.cpp:1037 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Resource temporarily unavailable" msgstr "Recurso temporariamente indisponível" #: ../../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/interface/netconfwizard.cpp:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Resposta:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Resultados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1395 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1418 +#: ../../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" @@ -6440,19 +6534,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:1277 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "A obter a lista de pastas de \"%s\" ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1274 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1269 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:936 msgid "Retrieving directory listing..." msgstr "A obter a lista de pastas ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 +#: ../../locales/../src/interface/netconfwizard.cpp:720 #, c-format msgid "Retrieving external IP address from %s" msgstr "A obter endereço IP externo a partir de %s" @@ -6469,7 +6563,7 @@ msgid "S&hutdown system" msgstr "D&esligar o computador" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Parar" @@ -6489,7 +6583,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:137 +#: ../../locales/../src/engine/proxy.cpp:154 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "O proxy SOCKS4 ligará a: %s" @@ -6498,34 +6592,34 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:858 msgid "Save settings?" msgstr "Guardar configurações?" #: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:978 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:969 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 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:1717 +#: ../../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:1719 +#: ../../locales/../src/interface/QueueView.cpp:1712 msgid "Scanning for files to upload" msgstr "A procurar ficheiros para enviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "&Condições para a procura:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Procurar na &pasta:" @@ -6537,17 +6631,17 @@ msgid "Search server for files" msgstr "Procurar no servidor pelos ficheiros" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" msgstr "Informações de segurança" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:580 +#: ../../locales/../src/interface/netconfwizard.cpp:593 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:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Sele&ccionar servidor" @@ -6566,7 +6660,7 @@ "Seleccione as acções predefinidas para executar se o ficheiro já existir no " "destino." -#: ../../locales/../src/interface/edithandler.cpp:1565 +#: ../../locales/../src/interface/edithandler.cpp:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Seleccionar o editor predefinido" @@ -6587,7 +6681,7 @@ "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:359 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Seleccione o ficheiro que contém a chave privada" @@ -6596,6 +6690,7 @@ msgstr "Seleccione um ficheiro para os dados exportados" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1489 msgid "Select file for exported queue" msgstr "Seleccione um ficheiro para a lista exportada" @@ -6604,7 +6699,7 @@ msgstr "Seleccione um ficheiro para exportadar as configurações" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2208 msgid "Select file for exported sites" msgstr "Seleccione um ficheiro para os sítios exportados" @@ -6616,15 +6711,15 @@ msgid "Select file to upload" msgstr "Seleccione o ficheiro para enviar" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:305 -msgid "Select filename for converted keyfile" -msgstr "Seleccione um nome de ficheiro para a chave de ficheiro convertida" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +msgid "Select filename for converted key file" +msgstr "Seleccione um nome para o ficheiro chave convertido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Seleccione como deverão ser abertos estes ficheiros." -#: ../../locales/../src/interface/search.cpp:482 +#: ../../locales/../src/interface/search.cpp:507 msgid "Select target download directory" msgstr "Seleccione a pasta de destino para descargas" @@ -6632,15 +6727,15 @@ msgid "Select target filename" msgstr "Seleccionar o nome do ficheiro pretendido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" msgstr "Seleccione as categorias para exportar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 msgid "Select the private data you would like to delete." msgstr "Seleccione os dados privados que deseja apagar." -#: ../../locales/../src/interface/search.cpp:450 +#: ../../locales/../src/interface/search.cpp:475 #, c-format msgid "Selected %d directory with its contents for transfer." msgid_plural "Selected %d directories with their contents for transfer." @@ -6654,7 +6749,7 @@ msgstr[0] "Seleccionada %d pasta." msgstr[1] "Seleccionadas %d pastas." -#: ../../locales/../src/interface/search.cpp:448 +#: ../../locales/../src/interface/search.cpp:473 #, c-format msgid "Selected %d file for transfer." msgid_plural "Selected %d files for transfer." @@ -6675,7 +6770,7 @@ 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:454 +#: ../../locales/../src/interface/search.cpp:479 #, c-format msgid "Selected %s and %s for transfer." msgstr "Seleccionados %s e %s para transferir." @@ -6690,34 +6785,34 @@ 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:1510 -#: ../../locales/../src/interface/edithandler.cpp:1585 +#: ../../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 "O editor seleccionado não existe." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "O ficheiro seleccionado já está a ser editado." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:388 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "O ficheiro seleccionado já está carregado." -#: ../../locales/../src/interface/edithandler.cpp:1683 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "O ficheiro seleccionado já está aberto" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1720 msgid "Selected file is still being edited" msgstr "O ficheiro seleccionado ainda está a ser editado" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:303 msgid "Selected filter only works for local files." msgstr "O filtro seleccionado apenas funciona para ficheiros locais." -#: ../../locales/../src/interface/menu_bar.cpp:307 +#: ../../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." @@ -6726,7 +6821,7 @@ "de servidor.\n" "Use marcadores próprios para este servidor." -#: ../../locales/../src/engine/engineprivate.cpp:288 +#: ../../locales/../src/engine/engineprivate.cpp:291 msgid "Selected port usually in use by a different protocol." msgstr "A porta seleccionada é habitualmente usada por um protocolo diferente." @@ -6739,34 +6834,34 @@ msgstr "" "Envia comandos personalizados ao servidor de outro modo não disponíveis" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4399 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 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:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Serial number:" msgstr "Número de série:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "&Tipo de Servidor:" -#: ../../locales/../src/engine/tlssocket.cpp:722 +#: ../../locales/../src/engine/tlssocket.cpp:741 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:892 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:945 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:890 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943 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:4233 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 #, 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:4229 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6775,15 +6870,15 @@ "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:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 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:2486 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 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:4244 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6792,7 +6887,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:840 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6800,11 +6895,11 @@ "O Servidor pode exigir uma conta. Tente especificar uma conta através do " "Gestor de Sítios." -#: ../../locales/../src/engine/ControlSocket.cpp:340 +#: ../../locales/../src/engine/ControlSocket.cpp:344 msgid "Server returned empty path." msgstr "O servidor devolveu um caminho vazio." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6812,13 +6907,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:3797 +#: ../../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 indeterminável. " "Falhou o modo passivo." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3791 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6826,36 +6921,36 @@ "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: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: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 msgid "Server sent unexpected reply." msgstr "O servidor enviou uma resposta inesperada." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../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:2047 +#: ../../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:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Tipo de &servidor:" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Server/Local file" msgstr "Ficheiro remoto/local" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Servidor:" @@ -6867,13 +6962,13 @@ msgid "Set &Priority" msgstr "Definir &Prioridade" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2336 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Definir permissões de '%s' para '%s'" -#: ../../locales/../src/engine/transfersocket.cpp:760 +#: ../../locales/../src/engine/transfersocket.cpp:791 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize chamado sem socket" @@ -6881,6 +6976,10 @@ msgid "Settings" msgstr "Configurações" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Pasta de configurações:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" msgstr "Mostrar &lista de pastas em bruto" @@ -6889,7 +6988,7 @@ msgid "Show &welcome dialog..." msgstr "Mostrar a janela de &boas-vindas..." -#: ../../locales/../src/interface/Mainfrm.cpp:2248 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "Show both directory trees and continue comparing?" msgstr "Mostrar ambas as árvores de pastas e continuar a comparação?" @@ -6901,7 +7000,7 @@ 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:438 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 msgid "Shows available TLS ciphers" msgstr "Mostrar as cifras TLS disponíveis" @@ -6909,7 +7008,7 @@ msgid "Shows this help dialog" msgstr "Mostra esta janela de ajuda" -#: ../../locales/../src/interface/QueueView.cpp:3077 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "Shutdown now" msgstr "Desligar o computador" @@ -6917,7 +7016,7 @@ msgid "Signature algorithm:" msgstr "Algorítmo de assinatura:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "Entradas do &Gestor de Sítios" @@ -6925,55 +7024,56 @@ msgid "Site Manager" msgstr "Gestor de Sítios" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 msgid "Site Manager - Cannot remember password" msgstr "Gestor de Sítios - Não lembrar a palavra-passe" -#: ../../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: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:1103 +#: ../../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 "Gestor de Sítios - Dados inválidos" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 msgid "Site Manager already open" msgstr "Gestor de Sítios já aberto" -#: ../../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: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 "O sítio não existe." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:411 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:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../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 "O caminho para o sítio está incorrecto." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" msgstr "Marcadores próprios dos sítios" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:539 +#: ../../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" @@ -6983,7 +7083,7 @@ "Gestor de Sítios.\n" "Adicionar a ligação actual ao gestor de sítios?" -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Size" msgstr "Tamanho" @@ -6995,50 +7095,50 @@ msgid "Size unknown" msgstr "Tamanho desconhecido" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../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 "Saltar ficheiro" -#: ../../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:1152 +#: ../../locales/../src/engine/ControlSocket.cpp:1169 +#: ../../locales/../src/engine/ControlSocket.cpp:1193 +#: ../../locales/../src/engine/ControlSocket.cpp:1253 #, c-format msgid "Skipping download of %s" msgstr "A saltar a transferência de %s" -#: ../../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/ControlSocket.cpp:1156 +#: ../../locales/../src/engine/ControlSocket.cpp:1172 +#: ../../locales/../src/engine/ControlSocket.cpp:1197 +#: ../../locales/../src/engine/ControlSocket.cpp:1257 #, c-format msgid "Skipping upload of %s" msgstr "A saltar o envio de %s" -#: ../../locales/../src/engine/socket.cpp:1041 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Socket address outside address space" msgstr "Endereço de socket fora do espaço do endereço" -#: ../../locales/../src/engine/socket.cpp:1043 +#: ../../locales/../src/engine/socket.cpp:1063 msgid "Socket already connected" msgstr "Socket já ligado" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Socket has been shut down" msgstr "O socket foi encerrado" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Socket not connected" msgstr "Socket não ligado" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1111 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:1196 +#: ../../locales/../src/interface/Mainfrm.cpp:1157 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." @@ -7056,7 +7156,7 @@ msgid "Sort directories inline" msgstr "Ordenar as pastas em linha" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:464 msgid "Sort order cannot be changed if comparing directories." msgstr "A ordenação não pode ser alterada quando a comparar pastas." @@ -7068,11 +7168,11 @@ msgid "Sorting &mode:" msgstr "Modo de &classificação:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 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/settings/optionspage_connection_sftp.cpp:315 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:139 msgid "Source and target file may not be the same" msgstr "O ficheiro original e o de destino podem não ser os mesmos" @@ -7084,7 +7184,7 @@ msgid "Source file:" msgstr "Ficheiro fonte:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 +#: ../../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" @@ -7094,11 +7194,11 @@ msgid "Speed limits" msgstr "Limites de velocidade" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:575 msgid "Speed limits are disabled, click to change." msgstr "Os limites de velocidade estão desativados, prima para mudar" -#: ../../locales/../src/interface/statusbar.cpp:576 +#: ../../locales/../src/interface/statusbar.cpp:578 msgid "Speed limits are enabled, click to change." msgstr "Os limites de velocidade estão activados, prima para mudar" @@ -7114,7 +7214,7 @@ msgid "Stable, beta and nightly versions" msgstr "Versões estáveis, beta e de desenvolvimento" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Começar a transferência de &imediato" @@ -7122,19 +7222,19 @@ msgid "Start with opened Site Manager" msgstr "Começar com o Gestor de Sítios aberto" -#: ../../locales/../src/interface/updater.cpp:276 +#: ../../locales/../src/interface/updater.cpp:212 #, c-format msgid "Started update check on %s\n" msgstr "Iniciada verificação de actualização em %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2192 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2146 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 #, c-format msgid "Starting download of %s" msgstr "A iniciar a transferência de %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2195 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 #, c-format msgid "Starting upload of %s" msgstr "A iniciar o envio de %s" @@ -7143,18 +7243,18 @@ msgid "Starts the local site in the given path" msgstr "Inicia o sítio local no caminho indicado" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Estado ou província" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Status" msgstr "Estado" #: ../../locales/../src/engine/logging.cpp:109 -#: ../../locales/../src/interface/StatusView.cpp:288 -#: ../../locales/../src/interface/StatusView.cpp:363 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Estado:" @@ -7162,7 +7262,11 @@ msgid "Stop and remove &all" msgstr "Parar e remover &tudo" -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +msgid "Stop recursive operation" +msgstr "Parar a operação constante" + +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Rua:" @@ -7178,11 +7282,11 @@ msgid "Summary of test results:" msgstr "Sumário dos resultados do teste:" -#: ../../locales/../src/interface/QueueView.cpp:3085 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Suspend now" msgstr "Suspender agora" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7190,28 +7294,29 @@ "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: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: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 msgid "Synchronized browsing" msgstr "Navegação sincronizada" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:370 msgid "Synchronized browsing has been disabled." msgstr "A navegação sincronizada foi desligada." #: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/quickconnectbar.cpp:122 msgid "Syntax error" msgstr "Erro de sintaxe" @@ -7220,8 +7325,8 @@ #: ../../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:2280 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Syntax error in command line" msgstr "Erro de sintaxe na linha de comandos" @@ -7229,11 +7334,15 @@ msgid "System" msgstr "Sistema" -#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Detalhes do sistema" + +#: ../../locales/../src/engine/socket.cpp:1052 msgid "System limit of open files exceeded" msgstr "Limite do sistema para ficheiros abertos excedido" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1109 msgid "System's network subsystem has failed" msgstr "Subsistema do sistema de rede falhou" @@ -7241,19 +7350,19 @@ msgid "T&oolbar" msgstr "Barra de &ferramentas" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 msgid "TLS connection established, sending HTTP request" msgstr "Ligação TLS estabelecida, a enviar o pedido HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:388 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 msgid "TLS connection established, waiting for welcome message..." msgstr "Ligação TLS estabelecida, à espera da mensagem de boas-vindas ..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 msgid "TLS connection established." msgstr "Ligação TLS estabelecida." -#: ../../locales/../src/engine/proxy.cpp:482 +#: ../../locales/../src/engine/proxy.cpp:499 msgid "TTL expired" msgstr "TTL expirado" @@ -7265,16 +7374,16 @@ msgid "Target file:" msgstr "Ficheiro destino:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2635 msgid "Target filename already exists!" msgstr "O nome do ficheiro já existe no destino!" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1603 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:1061 +#: ../../locales/../src/engine/socket.cpp:1082 msgid "Temporary failure in name resolution" msgstr "Falha temporária na resolução do nome" @@ -7282,11 +7391,16 @@ msgid "Test results" msgstr "Resultados do teste" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4250 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 msgid "Testing resume capabilities of server" msgstr "A testar as capacidades de retoma do servidor" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +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 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 " @@ -7304,34 +7418,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/xmlfunctions.cpp:389 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "O código do documento XML não está correcto: %s" - -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:634 #, c-format msgid "The address you entered was: %s" msgstr "O endereço que introduziu foi: %s" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1088 msgid "The ai_family member is not supported" msgstr "O membro ai_family não é suportado" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1101 msgid "The ai_socktype member is not supported" msgstr "O membro ai_socktype não é suportado" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:802 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Não foi possível guardar o marcador." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Não foi possível limpar os marcadores." -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "A ligação está encriptada. Prima o ícone para mais detalhes." @@ -7353,17 +7462,17 @@ "O formato de hora personalizado é inválido ou contém especificadores não " "suportados." -#: ../../locales/../src/engine/transfersocket.cpp:131 +#: ../../locales/../src/engine/transfersocket.cpp:141 #, 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:2895 -#: ../../locales/../src/interface/edithandler.cpp:1545 +#: ../../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 "Não foi encontrado o editor para os ficheiros de texto." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "O editor para os ficheiros de texto é o '%s'." @@ -7379,8 +7488,8 @@ msgid "The extension '%s' does already exist in the list" msgstr "A extensão '%s' já existe na 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" @@ -7389,8 +7498,8 @@ "O ficheiro %s já existe.\n" "Por favor insira um novo nome:" -#: ../../locales/../src/interface/edithandler.cpp:1656 -#: ../../locales/../src/interface/LocalListView.cpp:1711 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1699 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7401,20 +7510,29 @@ "Não foi encontrado o programa associado (%s).\n" "Por favor verifique as associações dos tipos de ficheiros." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:226 +#: ../../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 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 #, 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:41 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, 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:1651 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1695 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7423,8 +7541,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:1768 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1707 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7433,20 +7551,20 @@ "Não foi possível abrir o ficheiro '%s':\n" "O comando associado falhou" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, 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 ficheiro '%s' não está num formato suportado pelo FileZilla.\n" -"O ficheiro também é protegido por palavra-passe. Ficheiros protegidos por " -"palavra-passe ainda não são suportados pelo FileZilla.\n" -"Gostaria de o converter para um formato desprotegido e suportado?" +"O ficheiro '%s' foi criado por uma versão mais recente do FileZilla.\n" +"Carregar ficheiros criados por versões mais recentes pode resultar em perda " +"de informação.\n" +"Quer continuar?" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:269 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7455,22 +7573,11 @@ "O ficheiro '%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: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 "" -"O ficheiro '%s' é protegido por palavra-passe. Ficheiros protegidos por " -"palavra-passe ainda não são suportados pelo FileZilla.\n" -"Gostaria de o converter para um ficheiro desprotegido?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 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:79 +#: ../../locales/../src/interface/import.cpp:86 msgid "" "The file you have selected contains site manager data from a previous " "version of FileZilla.\n" @@ -7484,11 +7591,11 @@ "e palavra-passe serão importados.\n" "Continuar com a importação?" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 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:808 +#: ../../locales/../src/interface/listctrlex.cpp:809 msgid "The filename column cannot be hidden." msgstr "A coluna do nome dos ficheiros não pode ser escondida." @@ -7502,15 +7609,15 @@ msgid "The following characters will be replaced: %s" msgstr "Os seguintes caracteres serão substituídos: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1903 msgid "The following files are currently being edited:" msgstr "Os ficheiros seguintes estão a ser editados:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "A solução FTP de código aberto gratuita" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 msgid "The global bookmarks could not be saved." msgstr "Não foi possível guardar os marcadores globais." @@ -7528,7 +7635,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:275 +#: ../../locales/../src/interface/state.cpp:979 +#, 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 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Não existe a pasta local '%s'." + +#: ../../locales/../src/interface/state.cpp:249 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7554,11 +7671,16 @@ 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:1841 +#: ../../locales/../src/interface/QueueView.cpp:1832 msgid "The queue will not be saved." msgstr "A lista não será guardada." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:891 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Não existe a pasta remota '%s'." + +#: ../../locales/../src/interface/state.cpp:935 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7568,30 +7690,30 @@ "Desligar a navegação sincronizada e continuar com as alterações na pasta " "remota?" -#: ../../locales/../src/interface/import.cpp:69 +#: ../../locales/../src/interface/import.cpp:76 msgid "The selected categories have been imported." msgstr "As categorias seleccionadas foram importadas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 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:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../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 ficheiro seleccionado já está a ser editado:" -#: ../../locales/../src/interface/edithandler.cpp:1755 +#: ../../locales/../src/interface/edithandler.cpp:1720 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:1661 +#: ../../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" @@ -7601,15 +7723,15 @@ "Isto poderá ser perigoso e danificar o seu sistema.\n" "Quer mesmo continuar?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Não foi possível adicionar o servidor." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:590 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:505 msgid "The server uses following charset encoding for filenames:" msgstr "" "O servidor utiliza o seguinte mapa de caracteres para os nomes de ficheiro:" @@ -7622,7 +7744,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: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 " @@ -7632,7 +7754,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: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." @@ -7640,11 +7762,11 @@ "A chave do servidor é desconhecida. Não tem garantias que o servidor é o " "computador que pensa que é." -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1100 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:66 +#: ../../locales/../src/interface/import.cpp:73 msgid "" "The settings have been imported. You have to restart FileZilla for all " "settings to have effect." @@ -7652,19 +7774,19 @@ "As configurações foram importadas. Tem de reiniciar o FileZilla para que " "todas as configurações produzam efeito." -#: ../../locales/../src/engine/socket.cpp:1028 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "The specified address family is not supported" msgstr "A família de endereços especificada não é suportada" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1113 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:3080 +#: ../../locales/../src/interface/QueueView.cpp:3049 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:3076 +#: ../../locales/../src/interface/QueueView.cpp:3045 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." @@ -7676,11 +7798,11 @@ "O ficheiro já existe.\n" "Por favor escolha uma acção." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:858 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:77 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 #, 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" @@ -7689,15 +7811,15 @@ msgid "Themes" msgstr "Temas" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:443 msgid "This filter set cannot be removed." msgstr "Este conjunto de filtros não pode ser removido." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:383 msgid "This filter set cannot be renamed." msgstr "Este conjunto de filtros não pode ser renomeado." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7721,7 +7843,7 @@ "Este assistente ajudá-lo-á a configurar correctamente qualquer router ou " "firewall que tiver e testa a configuração." -#: ../../locales/../src/interface/queue.cpp:1186 +#: ../../locales/../src/interface/queue.cpp:1204 msgid "Time" msgstr "Tempo" @@ -7734,30 +7856,26 @@ msgstr "Tempo de espera, em &segundos:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/queue.cpp:323 msgid "Timeout" msgstr "Tempo de espera" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1666 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1030 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1621 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 #, 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 "A diferença para o fuso horário do servidor é de %d segundos." -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Título:" -#: ../../locales/../src/interface/Mainfrm.cpp:2246 +#: ../../locales/../src/interface/Mainfrm.cpp:2166 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:2247 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 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 " @@ -7823,17 +7941,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Mostra ou esconde a lista de transferências" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 msgid "Too long header line" msgstr "Linha de cabeçalho demasiado longa" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 msgid "Too many redirects" msgstr "Demasiados redireccionamentos" #: ../../locales/../src/engine/logging.cpp:113 -#: ../../locales/../src/interface/StatusView.cpp:282 -#: ../../locales/../src/interface/StatusView.cpp:349 +#: ../../locales/../src/interface/StatusView.cpp:289 +#: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" msgstr "Traçar:" @@ -7842,7 +7960,7 @@ msgid "Transfer" msgstr "Transferência" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "&Direcção da transferência" @@ -7858,21 +7976,21 @@ msgid "Transfer Queue" msgstr "Lista de Transferências" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 msgid "Transfer Settings" msgstr "Configurações para Transferências" -#: ../../locales/../src/engine/transfersocket.cpp:438 -#: ../../locales/../src/engine/transfersocket.cpp:460 +#: ../../locales/../src/engine/transfersocket.cpp:448 +#: ../../locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Transferência interrompida: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:637 msgid "Transferred data got tainted." msgstr "Os dados transferidos foram marcados." -#: ../../locales/../src/interface/queue.cpp:391 +#: ../../locales/../src/interface/queue.cpp:333 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "A transferir" @@ -7881,8 +7999,8 @@ msgid "Transfers" msgstr "Transferências" -#: ../../locales/../src/interface/QueueView.cpp:2976 -#: ../../locales/../src/interface/QueueView.cpp:2979 +#: ../../locales/../src/interface/QueueView.cpp:2947 +#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Transferências acabadas" @@ -7894,15 +8012,15 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Tratar os &seguintes tipos de ficheiro como ficheiros ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 msgid "Trust changed Hostkey:" msgstr "Confiar na Chave de Servidor alterada:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 msgid "Trust new Hostkey:" msgstr "Confiar na nova Chave de Servidor:" -#: ../../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 "Confiar nesta nova chave e continuar a ligar?" @@ -7910,7 +8028,7 @@ msgid "Trust this certificate and carry on connecting?" msgstr "Confiar neste certificado e continuar a ligação?" -#: ../../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 "Confiar neste servidor e continuar a ligar?" @@ -7919,8 +8037,8 @@ msgid "Try again" msgstr "Tente de novo" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Tipo" @@ -7932,11 +8050,11 @@ msgid "Type of generic proxy:" msgstr "Tipo de proxy genérico:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" msgstr "E&nviar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "Limite em &envio:" @@ -7946,35 +8064,35 @@ msgstr "U&sar as associações dos tipos de ficheiros, se disponíveis" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "&Usar as predefinições do sistema" +msgid "U&se system defaults for current language" +msgstr "U&sar o idioma indicado pelo sistema" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "UTILIZADOR@&SERVIDOR" -#: ../../locales/../src/engine/proxy.cpp:364 -#: ../../locales/../src/engine/proxy.cpp:491 +#: ../../locales/../src/engine/proxy.cpp:381 +#: ../../locales/../src/engine/proxy.cpp:508 #, c-format msgid "Unassigned error code %d" msgstr "Código de erro não atribuído %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Unidade:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1161 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Desconhecido" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 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:412 +#: ../../locales/../src/engine/proxy.cpp:429 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Versão do protocolo SOCKS desconhecida: %d" @@ -7983,20 +8101,11 @@ msgid "Unknown certificate" msgstr "Certificado desconhecido" -#: ../../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 "" -"Erro desconhecido ao abrir o ficheiro. Certifique-se que o ficheiro pode ser " -"acedido e de que é um documento XML correcto." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Chave de servidor desconhecida" -#: ../../locales/../src/engine/proxy.cpp:420 +#: ../../locales/../src/engine/proxy.cpp:437 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8005,14 +8114,14 @@ "Versão do Protocolo da Autenticação, Nome de Utilizador / Palavra-Passe, por " "SOCKS desconhecida: %d" -#: ../../locales/../src/interface/xmlfunctions.cpp:420 +#: ../../locales/../src/interface/xmlfunctions.cpp:304 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:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../locales/../src/interface/netconfwizard.cpp:612 +#: ../../locales/../src/interface/netconfwizard.cpp:623 msgid "" "Unless these problems get fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8020,7 +8129,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:598 +#: ../../locales/../src/interface/netconfwizard.cpp:599 msgid "" "Unless this problem gets fixed, active mode FTP will not work and passive " "mode has to be used." @@ -8028,15 +8137,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:1017 +#: ../../locales/../src/engine/tlssocket.cpp:1096 msgid "Unsupported certificate type" msgstr "Este tipo de certificado não é suportado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 msgid "Unsupported redirect" msgstr "Este redireccionamento não é suportado" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" msgstr "E&nviar sem editar" @@ -8045,24 +8154,24 @@ msgid "Updates" msgstr "Actualizações" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Enviar" -#: ../../locales/../src/interface/edithandler.cpp:1124 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "O envio falhou" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" msgstr "Limite para envio: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" msgstr "Limite para envio: nenhum" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Enviar a pasta seleccionada" @@ -8070,31 +8179,31 @@ msgid "Upload selected files and directories" msgstr "Enviar os ficheiros e as pastas seleccionados" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "Enviar este ficheiro de volta ao servidor?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "Enviar este ficheiro para o servidor?" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1152 -#: ../../locales/../src/interface/edithandler.cpp:1317 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "A enviar" -#: ../../locales/../src/interface/edithandler.cpp:1121 -#: ../../locales/../src/interface/edithandler.cpp:1319 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" msgstr "A enviar e a remoção pendente" -#: ../../locales/../src/interface/edithandler.cpp:1155 -#: ../../locales/../src/interface/edithandler.cpp:1321 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" msgstr "A enviar e a terminar a edição" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Usar um &mapa de caracteres personalizado" @@ -8102,40 +8211,40 @@ msgid "Use &custom editor:" msgstr "Usar um editor &próprio:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Usar o &editor predefinido para ficheiros de texto" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../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:516 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:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "Usar a acção predefinida" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 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:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Usar o servidor agora ligado para" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Usar um servidor do Gestor de Sítios" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Usar as &predefinições do sistema" +msgid "Use system &defaults for current language" +msgstr "Usar o &idioma indicado pelo sistema" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8173,16 +8282,11 @@ msgstr "Utilizador:" #: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1033 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 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/engine/ftpcontrolsocket.cpp:4326 -#, c-format -msgid "Using proxy %s" -msgstr "A usar o proxy %s" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8201,19 +8305,15 @@ msgid "Verbose log messages from wxWidgets" msgstr "Mensagens de entrada eloquentes a partir de wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1146 msgid "Verifying certificate..." msgstr "A verificar o certificado ..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Versão:" - #: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Muito alta" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 msgid "View hidden option set, but unsupported by server" msgstr "Ver o conjunto escondido de opções, mas não suportado pelo servidor" @@ -8221,7 +8321,7 @@ msgid "View/Edit" msgstr "Ver/Editar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Colunas vísiveis" @@ -8229,15 +8329,15 @@ msgid "W&rite" msgstr "E&screver" -#: ../../locales/../src/interface/QueueView.cpp:1677 +#: ../../locales/../src/interface/QueueView.cpp:1670 msgid "Waiting" msgstr "À espera" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Waiting for browsing connection" msgstr "A esperar pela ligação do navegador" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:330 msgid "Waiting for password" msgstr "À espera da palavra-passe" @@ -8245,42 +8345,11 @@ msgid "Waiting for transfer to be cancelled" msgstr "À espera do cancelamento da transferência" -#: ../../locales/../src/engine/engineprivate.cpp:226 +#: ../../locales/../src/engine/engineprivate.cpp:229 msgid "Waiting to retry..." msgstr "À espera para voltar a tentar ..." -#: ../../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" -"Um erro no Windows causa problemas com o FileZilla\n" -"\n" -"O erro ocorre se tiver:\n" -"- O Windows Server 2003 ou o XP 64\n" -"- A Firewall do Windows ligada\n" -"- O 'Serviço de gateway de camada de aplicação' a correr\n" -"Veja o sítio http://support.microsoft.com/kb/931130 para outras " -"informações.\n" -"\n" -"A menos que desligue a Firewall do Windows ou o 'Serviço de gateway de " -"camada de aplicação',\n" -"o FileZilla entrará em espera em grandes transferências." - -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:975 msgid "Warning, ignoring data connection from wrong IP." msgstr "Aviso, a ignorar a ligação de um IP errado." @@ -8299,15 +8368,15 @@ "\n" "Quer mesmo procurar versões de desenvolvimento?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Aviso: Possível quebra de segurança!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Bem-vindo ao FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Novidades" @@ -8315,13 +8384,13 @@ msgid "What's new:" msgstr "Novidades:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../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 "" -"Se for permitido que o Filezilla lembre as palavras-passe, pode voltar a " -"ligar sem necessitar de indicar a palavra-passe após reíniciar o Filezilla." +"Se for permitido que o FileZilla lembre as palavras-passe, pode voltar a " +"ligar sem necessitar de indicar a palavra-passe após reíniciar o FileZilla." #: ../../locales/../src/interface/resources/xrc/settings.xrc:991 msgid "" @@ -8340,28 +8409,28 @@ msgid "Widescreen" msgstr "Ecrã panorâmico" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" -msgstr "Deseja que o Filezilla lembre as palavras-passe?" +msgstr "Deseja que o FileZilla lembre as palavras-passe?" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "Es&crever" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:449 +#: ../../locales/../src/interface/netconfwizard.cpp:456 msgid "Wrong external IP address" msgstr "Endereço de IP externo errado" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 msgid "Wrong line endings" msgstr "Fins de linha incorrectos" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 msgid "Yes" msgstr "Sim" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:777 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8373,7 +8442,7 @@ 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:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 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." @@ -8408,23 +8477,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:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 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:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "Seleccionou pelo menos uma ligação simbólica." -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/edithandler.cpp:1587 +#: ../../locales/../src/interface/search.cpp:725 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:1677 +#: ../../locales/../src/interface/LocalListView.cpp:1665 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8433,34 +8502,38 @@ "continuar?" #: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Tem que inserir um nome de servidor." -#: ../../locales/../src/interface/search.cpp:493 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +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 msgid "You have to enter a local directory." msgstr "Tem que indicar uma pasta local." -#: ../../locales/../src/interface/netconfwizard.cpp:164 +#: ../../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:498 +#: ../../locales/../src/interface/search.cpp:523 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:1043 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 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:1018 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 msgid "You have to specify a user name" msgstr "Tem de indicar um nome de utilizador" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:638 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8476,7 +8549,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:1506 +#: ../../locales/../src/interface/edithandler.cpp:1472 msgid "You need to enter a properly quoted command." msgstr "Tem que indicar um comando apropriado." @@ -8489,16 +8562,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:77 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:440 -#: ../../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:1127 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:84 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:447 -#: ../../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:1134 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8506,7 +8579,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:1065 +#: ../../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." @@ -8530,7 +8603,7 @@ msgid "You need to specify a server." msgstr "Tem de indicar um servidor" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8538,7 +8611,7 @@ "Não deve ter problemas em ligar a outros servidores, as transferências de " "ficheiros devem funcionar normalmente." -#: ../../locales/../src/interface/QueueView.cpp:3084 +#: ../../locales/../src/interface/QueueView.cpp:3053 msgid "Your computer will suspend unless you click Cancel." msgstr "O computador entrará em suspensão caso não prima em Cancelar." @@ -8555,7 +8628,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" @@ -8563,7 +8636,7 @@ msgid "contains" msgstr "contém" -#: ../../locales/../src/interface/updater.cpp:280 +#: ../../locales/../src/interface/updater.cpp:216 msgid "custom" msgstr "personalizado" @@ -8585,10 +8658,10 @@ msgid "equals" msgstr "igual a" -#: ../../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:529 +#: ../../locales/../src/interface/filelistctrl.cpp:548 +#: ../../locales/../src/interface/filelistctrl.cpp:575 +#: ../../locales/../src/interface/filelistctrl.cpp:591 msgid "file" msgstr "ficheiro" @@ -8596,8 +8669,8 @@ 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:203 msgid "" "fzputtygen could not be started.\n" "Please make sure this executable exists in the same directory as the main " @@ -8607,15 +8680,15 @@ "Por favor, certifique-se que este executável existe na mesma pasta de " "programa do FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp pertence a uma versão diferente do FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1483 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 msgid "fzsftp could not be started" msgstr "fzsftp não pôde ser iniciado" -#: ../../locales/../src/engine/tlssocket.cpp:1044 +#: ../../locales/../src/engine/tlssocket.cpp:1125 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "" "o módulo gnutls_certificate_get_peers não devolveu qualquer certificado" @@ -8672,10 +8745,11 @@ msgid "owner writeable" msgstr "proprietário para escrita" -#: ../../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: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 msgid "unknown" msgstr "desconhecido" @@ -8695,8 +8769,100 @@ msgid "wxWidgets:" msgstr "wxWidgets:" -#~ msgid "Timezone offset of server is %d seconds." -#~ msgstr "A diferença para o fuso horário do servidor é de %d segundos." +#~ msgid "" +#~ "Any changes made in the Site Manager will not be saved unless you repair " +#~ "the file." +#~ msgstr "" +#~ "Não será guardada qualquer alteração no Gestor de Sítios sem que repare o " +#~ "ficheiro." + +#~ msgid "Cannot compare directories, not connected to a server." +#~ msgstr "Não é possível comparar pastas, não está ligado a um servidor." + +#~ msgid "Clear &Site Manager entries" +#~ msgstr "Limpar &as entradas do Gestor de Sítios" + +#~ msgid "Clear &transfer queue" +#~ msgstr "Limpar &a lista de transferências" + +#~ msgid "Operating system problem detected" +#~ msgstr "Foi detectado um problema no sistema operativo" + +#~ msgid "The XML document is not well-formed: %s" +#~ msgstr "O código do documento XML não está correcto: %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' não está num formato suportado pelo FileZilla.\n" +#~ "O ficheiro também é protegido por palavra-passe. Ficheiros protegidos por " +#~ "palavra-passe 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 ficheiro '%s' é protegido por palavra-passe. Ficheiros protegidos por " +#~ "palavra-passe ainda não são suportados pelo FileZilla.\n" +#~ "Gostaria de o converter para um ficheiro 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 as predefinições 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 ficheiro. Certifique-se que o ficheiro pode " +#~ "ser acedido e de que é um documento XML correcto." + +#~ msgid "Use system &defaults" +#~ msgstr "Usar as &predefinições do sistema" + +#~ msgid "Using proxy %s" +#~ msgstr "A usar 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 tiver:\n" +#~ "- O Windows Server 2003 ou o XP 64\n" +#~ "- A Firewall do Windows ligada\n" +#~ "- O 'Serviço de gateway de camada de aplicação' a correr\n" +#~ "Veja o sítio http://support.microsoft.com/kb/931130 para outras " +#~ "informações.\n" +#~ "\n" +#~ "A menos que desligue a Firewall do Windows ou o 'Serviço de gateway de " +#~ "camada de aplicação',\n" +#~ "o FileZilla entrará em espera em grandes transferências." #~ msgid "&Crash" #~ msgstr "&Abortar" diff -Nru filezilla-3.14.1/locales/ru.po filezilla-3.15.0.2/locales/ru.po --- filezilla-3.14.1/locales/ru.po 2015-07-30 10:04:18.000000000 +0000 +++ filezilla-3.15.0.2/locales/ru.po 2016-02-05 08:54:46.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Русский перевод\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-30 12:00+0200\n" -"PO-Revision-Date: 2015-07-17 11:33+0600\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-25 11:31+0600\n" "Last-Translator: Pavel Starosek \n" "Language-Team: Oleg Koptev\n" "Language: ru\n" @@ -53,9 +53,9 @@ msgstr[1] "%d каталога" msgstr[2] "%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" @@ -65,9 +65,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" @@ -91,12 +91,12 @@ msgstr[1] "%d файла. Общий размер: не менее %s" msgstr[2] "%d файлов. Общий размер: не менее %s" -#: ../../locales/../src/interface/QueueView.cpp:2784 +#: ../../locales/../src/interface/QueueView.cpp:2772 #, 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" @@ -108,7 +108,7 @@ msgid "%h - Host" msgstr "%h - Хост" -#: ../../locales/../src/interface/recursive_operation_status.cpp:88 +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 #, c-format msgid "%llu directory" msgid_plural "%llu directories" @@ -116,7 +116,7 @@ msgstr[1] "%llu каталога" msgstr[2] "%llu каталогов" -#: ../../locales/../src/interface/recursive_operation_status.cpp:87 +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 #, c-format msgid "%llu file" msgid_plural "%llu files" @@ -139,7 +139,7 @@ msgid "%s (? B/s)" msgstr "%s (? Б/сек)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Срок действия сертификата истек!" @@ -172,7 +172,7 @@ msgstr[1] "%s байт" msgstr[2] "%s байт" -#: ../../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 " @@ -186,7 +186,7 @@ "Пожалуйста, загрузите 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 " @@ -203,7 +203,7 @@ "PATH.\n" "- Укажите полный путь к %s в переменной среды FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s с %d бит" @@ -217,7 +217,7 @@ msgid "%w - Proxy password" msgstr "%w - Пароль прокси" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3480 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Прервать предыдущее соединение и подключиться в текущей вкладке" @@ -225,14 +225,14 @@ msgid "&About..." msgstr "&О программе..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2477 -#: ../../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 "&Учетная запись:" #: ../../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/sitemanager.xrc:448 msgid "&Active" msgstr "&Активный" @@ -246,15 +246,15 @@ msgstr "&Добавить файлы в задание" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." +msgid "&Add key file..." msgstr "&Добавить файл с ключом..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:483 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" msgstr "&Добавить в задание" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:335 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "&Применить настройки временной зоны сервера:" @@ -270,7 +270,7 @@ msgid "&Always use default editor" msgstr "&Всегда использовать редактор по умолчанию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2947 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Всегда использовать для файлов без ассоциации" @@ -283,17 +283,17 @@ msgstr "&Получить сведения о внешнем IP-адресе в настройках системы" #: ../../locales/../src/interface/resources/xrc/menus.xrc:140 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:586 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "&Авто" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:468 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 msgid "&Autodetect" msgstr "&Автоопределение" #: ../../locales/../src/interface/resources/xrc/menus.xrc:148 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:585 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "&Двоичный" @@ -306,14 +306,14 @@ msgid "&Bookmarks" msgstr "&Закладки" -#: ../../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/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:295 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:337 msgid "&Browse..." msgstr "&Обзор..." @@ -323,8 +323,8 @@ #: ../../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: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" @@ -342,7 +342,7 @@ msgid "&Close FileZilla" msgstr "&Закрыть FileZilla" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." msgstr "&Настройка ограничения скорости..." @@ -350,7 +350,7 @@ msgid "&Configure..." msgstr "&Настройка..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:547 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" msgstr "&Соединиться" @@ -359,18 +359,18 @@ msgstr "&Копировать текущее соединение в Менеджер Сайтов..." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:803 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:425 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 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:489 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 msgid "&Create directory" msgstr "&Создать каталог" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:602 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" msgstr "&Создать новую вкладку" @@ -397,14 +397,14 @@ #: ../../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/dialogs.xrc:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" msgstr "&Удалить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3216 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Удалить символьную ссылку" @@ -412,6 +412,20 @@ msgid "&Directory comparison" msgstr "&Сравнить каталоги" +#: ../../locales/../src/interface/state.cpp:887 +msgid "" +"&Disable synchronized browsing and continue changing the local directory" +msgstr "" +"&Выключить синхронизированный просмотр и продолжить изменение локального " +"каталога?" + +#: ../../locales/../src/interface/state.cpp:960 +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 "&Отменить локальный файл, закачать и возобновить редактирование" @@ -432,7 +446,7 @@ msgid "&Display size in bytes" msgstr "&Показывать размер файла в байтах" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Не запоминать пароли (рекомендуется)" @@ -449,15 +463,15 @@ msgstr "&Действие по двойному клику на файлах:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:286 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" msgstr "&Скачать" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3105 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Скачать в:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:591 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." msgstr "&Скачать..." @@ -477,8 +491,8 @@ #: ../../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:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" msgstr "&Включить" @@ -486,12 +500,12 @@ msgid "&Enable compression" msgstr "&Включить сжатие" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3538 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 #: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "&Включить ограничения скорости" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:493 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "&Кодировка:" @@ -499,11 +513,11 @@ msgid "&Encryption:" msgstr "&Шифрование:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "&Ввести произвольную команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3473 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Установить соединение на новой вкладке" @@ -516,7 +530,7 @@ msgstr "&Экспорт записей из Менеджера Сайтов" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." msgstr "&Экспорт..." @@ -528,7 +542,7 @@ msgid "&File" msgstr "&Файл" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:510 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Атрибуты файла..." @@ -536,7 +550,7 @@ msgid "&File permissions..." msgstr "&Права доступа к файлу..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2238 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Файл:" @@ -556,7 +570,7 @@ msgid "&Finish editing and delete local file" msgstr "&Закончить правку и удалить локальный файл" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3141 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -564,7 +578,7 @@ "&Сгладьте удаленные пути, загрузите все содержащиеся файлы прямо в целевой " "каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Следуя символьной ссылке удалить содержимое каталога" @@ -576,7 +590,7 @@ msgid "&Getting help..." msgstr "&Получение помощи..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2590 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Общая закладка" @@ -589,7 +603,7 @@ msgstr "&Помощь" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "&Скрыть одинаковые файлы" @@ -601,7 +615,7 @@ msgid "&Highest available port:" msgstr "&Наибольший доступный порт:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2385 +#: ../../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:" @@ -627,10 +641,14 @@ msgid "&Install new version" msgstr "&Установить новую версию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3134 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 msgid "&Keep remote path structure relative to search root" msgstr "&Оставьте структуру удаленных путей относительно корня поиска" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "&Файл с ключом:" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "&Раскладка панелей:" @@ -639,7 +657,7 @@ msgid "&Limit local ports used by FileZilla" msgstr "&Ограничение используемых локальных портов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:422 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" msgstr "&Ограничение одновременных подключений" @@ -647,8 +665,8 @@ msgid "&Local directory tree" msgstr "&Локальный &список" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2644 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2727 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "&Локальный каталог:" @@ -656,11 +674,11 @@ msgid "&Log to file" msgstr "&Записать в лог-файл" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Тип входа:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2440 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Тип входа:" @@ -676,7 +694,7 @@ msgid "&Manual transfer..." msgstr "&Передача вручную..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:432 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "&Макс. число подключений:" @@ -696,7 +714,7 @@ msgid "&Name sorting mode:" msgstr "&Имена файлов:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2617 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Имя:" @@ -712,11 +730,11 @@ msgid "&New Site" msgstr "&Новый Сайт" -#: ../../locales/../src/interface/Mainfrm.cpp:1708 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Доступна новая версия!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Дальше >" @@ -739,8 +757,8 @@ msgstr "&Числовое значение:" #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&ОК" @@ -749,7 +767,7 @@ 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:557 msgid "&Open" msgstr "&Открыть" @@ -757,7 +775,7 @@ msgid "&Overwrite" msgstr "&Перезаписать" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:413 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Пассивный" @@ -769,7 +787,7 @@ msgid "&Play sound" msgstr "&Проиграть звук" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2398 +#: ../../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:" @@ -808,7 +826,7 @@ msgstr "Информация &повторного соединения" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:613 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" msgstr "&Обновить" @@ -816,16 +834,16 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Запомнить пароль до закрытия FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3643 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Запомнить пароли" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2671 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2751 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Удаленный каталог:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2274 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "&Удаленный путь:" @@ -842,11 +860,11 @@ msgstr "&Удалить выбранное" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1244 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2813 +#: ../../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:502 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 +#: ../../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 "&Переименовать" @@ -867,7 +885,7 @@ msgid "&Report a bug..." msgstr "&Сообщить об ошибке..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" msgstr "&Очистить все и получить снова" @@ -903,7 +921,7 @@ msgid "&Save as..." msgstr "&Сохранить как..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2996 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Искать" @@ -919,11 +937,11 @@ msgid "&Select language:" msgstr "&Выбрать язык:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2126 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 msgid "&Select the columns that should be displayed:" msgstr "&Выбрать колонки для отображения:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Сервер" @@ -940,7 +958,7 @@ msgid "&Show debug menu" msgstr "&Показать меню отладки" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "&Показать детали" @@ -960,7 +978,7 @@ msgid "&Site Manager..." msgstr "&Менеджер Сайтов..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2598 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Индивидуальная закладка" @@ -972,7 +990,7 @@ msgid "&Speed limits" msgstr "&Ограничение скорости" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3152 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Начать передачу сейчас" @@ -980,11 +998,11 @@ msgid "&Swap local and remote panes" msgstr "&Поменять панели местами" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "&TLS Шифрование" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Тест" @@ -996,7 +1014,7 @@ msgid "&Transfer" msgstr "&Передача" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:389 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "&Режим передачи:" @@ -1018,7 +1036,7 @@ msgstr "&Обновить ключ в кэше для этого хоста" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:537 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" msgstr "&Закачать на сервер" @@ -1027,11 +1045,11 @@ msgid "&Uploads:" msgstr "&Закачки:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2922 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Использовать программу по выбору" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "&Использовать синхронизированный просмотр" @@ -1052,8 +1070,8 @@ msgstr "&Использовать разделитель тысяч" #: ../../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:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "&Пользователь:" @@ -1061,7 +1079,7 @@ msgid "&Username:" msgstr "&Имя пользователя" -#: ../../locales/../src/interface/Mainfrm.cpp:1702 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Версия %s" @@ -1071,7 +1089,7 @@ msgstr "&Вид" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:594 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" msgstr "&Просмотр/Правка" @@ -1092,25 +1110,25 @@ msgid "&Yes" msgstr "&Да" -#: ../../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' не существует либо недоступен" -#: ../../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' не каталог" -#: ../../locales/../src/interface/manual_transfer.cpp:426 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:951 +#: ../../locales/../src/interface/manual_transfer.cpp:427 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:967 msgid "'Account' logontype not supported by selected protocol" msgstr "Вход с помощью учетной записи не поддерживается выбранным протоколом" -#: ../../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." @@ -1118,7 +1136,7 @@ "Типы входа 'Нормальный' и 'Учетная запись' недоступны, используйте 'Спросить " "пароль'." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:966 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1126,7 +1144,7 @@ "Типы входа 'Нормальный' и 'Учетная запись' недоступны. Ваша запись будет " "изменена на 'Спросить пароль'." -#: ../../locales/../src/interface/Mainfrm.cpp:598 +#: ../../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 " @@ -1185,8 +1203,8 @@ 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/dialogs.xrc:3591 #: ../../locales/../src/interface/resources/xrc/settings.xrc:919 #: ../../locales/../src/interface/resources/xrc/settings.xrc:944 #, c-format @@ -1245,7 +1263,7 @@ msgid "64-bit system" msgstr "64-битная система" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Назад" @@ -1264,8 +1282,8 @@ msgstr "Необходимо указать редактор по умолчанию." #: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:740 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Каталог не может быть перенесен в один из своих подкаталогов." @@ -1283,18 +1301,18 @@ msgid "A file previously opened has been changed." msgstr "Ранее открытый файл был изменен." -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "A file with that name is already being transferred." msgstr "Файл в таким именем уже передается." -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "" "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 " @@ -1312,7 +1330,7 @@ msgid "A new version of FileZilla is available:" msgstr "Доступна новая версия FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:658 +#: ../../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." @@ -1329,7 +1347,7 @@ "Обычно сервер не требует этого. Свяжитесь с администратором, если вам это " "нужно." -#: ../../locales/../src/interface/state.cpp:256 +#: ../../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?" @@ -1339,7 +1357,7 @@ "каталога?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:144 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:590 #: ../../locales/../src/interface/resources/xrc/settings.xrc:1062 msgid "A&SCII" msgstr "A&SCII" @@ -1364,11 +1382,11 @@ msgid "A&pply to all files and directories" msgstr "П&рименить ко всем файлам и каталогам" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:472 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "&Автоматически очищать успешные загрузки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2529 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1380,15 +1398,15 @@ msgid "Above the file lists" msgstr "Поверх списка файлов" -#: ../../locales/../src/engine/server.cpp:836 -#: ../../locales/../src/engine/server.cpp:855 -#: ../../locales/../src/interface/manual_transfer.cpp:153 +#: ../../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: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/sitemanager_dialog.cpp:1271 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1272 +#: ../../locales/../src/interface/manual_transfer.cpp:541 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1309 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1310 msgid "Account" msgstr "Учетная запись" @@ -1412,7 +1430,7 @@ msgid "Active mode" msgstr "Активный режим" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1420,7 +1438,7 @@ "Тест активного режима не удался. FileZilla не знает правильного внешнего IP-" "адреса." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1428,7 +1446,7 @@ "Тест активного режима не удался. FileZilla не знает правильный внешний IP-" "адрес. Кроме того, ваш маршрутизатор изменил отправленный адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1441,12 +1459,12 @@ msgid "Active mode IP" msgstr "IP-адрес для активного режима" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3159 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "&Добавить файлы только в задание" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../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 "Добавить выбранный каталог в задание" @@ -1460,11 +1478,11 @@ msgid "Add to queue" msgstr "Добавить в задание" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Этот тип адреса не поддерживается" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Дополнительно" @@ -1483,7 +1501,7 @@ "могут даже повредить вашу систему. Используйте бета-версии и ночные сборки " "на свой страх и риск." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Всегда использовать это действие" @@ -1491,7 +1509,7 @@ msgid "Algorithm:" msgstr "Алгоритм:" -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Все файлы успешно переданы" @@ -1499,7 +1517,7 @@ msgid "All ports in the given range have to be between 1024 and 65535." msgstr "Все порты должны находиться в диапазоне между 1024 и 65535." -#: ../../locales/../src/interface/QueueView.cpp:2960 +#: ../../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." @@ -1515,11 +1533,11 @@ msgid "Allow fallback to other transfer mode on failure" msgstr "Разрешить возврат к другому режиму передачи при сбое" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3450 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Соединение установлено" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Альтернативное имя:" @@ -1550,7 +1568,7 @@ msgstr "" "Кроме того, вы также можете загрузить последнюю версию с сайта FileZilla:" -#: ../../locales/../src/interface/QueueView.cpp:1919 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1559,7 +1577,7 @@ "Ошибка при загрузке очереди передач из \"%s\".\n" "Часть передач не была восстановлена." -#: ../../locales/../src/interface/QueueView.cpp:1829 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1568,37 +1586,37 @@ "Ошибка при сохранении очереди передач в \"%s\".\n" "Часть передач не была сохранена." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1920 +#: ../../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: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: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 "Анонимный" -#: ../../locales/../src/interface/state.cpp:914 +#: ../../locales/../src/interface/state.cpp:937 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:808 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 "Любые изменения в фильтрах не будут сохранены." @@ -1622,7 +1640,7 @@ msgid "Archive" msgstr "Архив" -#: ../../locales/../src/engine/socket.cpp:1094 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Переполнение буфера" @@ -1638,9 +1656,9 @@ 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:856 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Запросить пароль" @@ -1652,7 +1670,7 @@ 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:3416 msgid "Asking questions in the FileZilla forums" msgstr "Задать вопрос на FileZilla форуме" @@ -1672,7 +1690,7 @@ msgid "Attribute" msgstr "Атрибут" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Сбой аутентификации." @@ -1680,7 +1698,7 @@ msgid "Author:" msgstr "Автор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Авто" @@ -1697,15 +1715,15 @@ msgid "B " msgstr "B <Символ для байта. Переводится только первое письмо>" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:267 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:309 msgid "B&ypass proxy" msgstr "О&бход прокси" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Неверный дескриптор файла" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3356 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Основные инструкции по применению" @@ -1713,16 +1731,16 @@ msgid "Behaviour" msgstr "Состояние" -#: ../../locales/../src/interface/edithandler.cpp:1115 -#: ../../locales/../src/interface/edithandler.cpp:1143 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "Редактируется" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Внимание! Сертификат был отозван" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2534 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "Двоичный" @@ -1732,18 +1750,22 @@ #: ../../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_dialog.cpp:418 msgid "Bookmark" msgstr "Закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2790 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Закладка:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2779 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Закладки" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Обзор..." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Дата сборки:" @@ -1752,7 +1774,7 @@ msgid "Build information" msgstr "Информация о сборке" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Вид деятельности:" @@ -1770,12 +1792,12 @@ msgid "C&ancel current operation" msgstr "О&тменить текущую операцию" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" msgstr "О&чистить все" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:506 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" msgstr "&Копировать адрес в буфер обмена" @@ -1792,21 +1814,21 @@ msgstr "Характеристики ЦП:" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1201 +#: ../../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" @@ -1822,15 +1844,16 @@ #: ../../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/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 "Отмена" @@ -1842,20 +1865,20 @@ msgid "Cancels the current operation" msgstr "Отменить текущую операцию" -#: ../../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 "Нет доступа к '%s', нет данных, либо диск не готов." -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Невозможно добавить сервер в Менеджер Сайтов" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Невозможно назначить запрошенный адрес" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:352 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1875,22 +1898,22 @@ msgid "Cannot create new filter" 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:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../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:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1903,53 +1926,53 @@ msgid "Cannot load Quickconnect bar from resource file" msgstr "Невозможно загрузить панель быстрого соединения из файла ресурсов" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 -msgid "Cannot load keyfile" -msgstr "Невозможно загрузить файл с ключем" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Невозможно загрузить файл с ключом" -#: ../../locales/../src/interface/Mainfrm.cpp:1004 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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 "Не запоминать пароль" #: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 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:172 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Не удается перевести имя хоста в IPv4 адрес для использования с SOCKS4 " "прокси." -#: ../../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 "Невозможно выбрать фильтр" -#: ../../locales/../src/interface/edithandler.cpp:1473 -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Невозможно ассоциировать файл" -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Невозможно отобразить диалоговое окно" -#: ../../locales/../src/interface/edithandler.cpp:1645 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "Cannot view/edit selected file" msgstr "Невозможно просмотреть/редактировать выделенный файл" @@ -1994,7 +2017,7 @@ msgstr "Изменить атрибуты файла" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." msgstr "Изменить права для файлов." @@ -2002,11 +2025,11 @@ 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 "Проблема кодирования символов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Кодировка" @@ -2030,7 +2053,7 @@ msgid "Check for updates failed" msgstr "Не удалось проверить обновления" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2038,7 +2061,7 @@ "Проверьте свои учетные данные для входа. Введенный пароль начинается или " "заканчивается пробелом." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2046,7 +2069,7 @@ "Проверьте свои учетные данные для входа. Введенное имя пользователя " "начинается или заканчивается пробелом." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Проверка корректного внешнего IP" @@ -2054,27 +2077,31 @@ 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:1440 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +msgid "Choose a key file" +msgstr "Конвертировать файл с ключом" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 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:2132 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "Выбрать локальный каталог" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:819 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Часть данных неправильно удалена" @@ -2083,7 +2110,7 @@ msgstr "Шифр:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" msgstr "Зак&рыть вкладку" @@ -2091,7 +2118,7 @@ msgid "Classic" msgstr "Классический" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" msgstr "Очистить &кэш раскладки" @@ -2112,25 +2139,25 @@ msgid "Clear quickconnect bar" msgstr "Очистить строку соединения" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Нажмите 'Завершить' для сохранения конфигурации." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "MAC-адрес клиент-сервер:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "Шифр клиент-сервер:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:609 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" msgstr "Закрыть &все прочие вкладки" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Закрыть FileZilla" @@ -2142,7 +2169,7 @@ msgid "Closes current tab" msgstr "Закрыть текущую вкладку" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "Ко&мментарии:" @@ -2150,7 +2177,7 @@ msgid "Column properties" msgstr "Свойства колонки" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Настройка колонки" @@ -2158,13 +2185,13 @@ 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:153 -#: ../../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:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Команда не поддерживается" @@ -2172,32 +2199,32 @@ 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 "Команда:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 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:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 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:535 msgid "Compare &modification time" msgstr "Сравнить время модификации" #: ../../locales/../src/interface/resources/xrc/menus.xrc:78 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:522 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Сравнить размеры файлов" @@ -2234,7 +2261,7 @@ msgstr "Число одновременных передач" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3046 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" msgstr "Условия чувствительны к р&егистру" @@ -2250,24 +2277,24 @@ msgid "Configure port range" msgstr "Настройка диапазона портов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3362 +#: ../../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: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: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 "Необходимо подтверждение" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Поздравляем, ваша конфигурация работает." @@ -2275,6 +2302,11 @@ msgid "Connect bypassing proxy settings" msgstr "Подключиться в обход настроек прокси" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Не удалось подключиться: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Подключиться в текущей вкладке" @@ -2287,29 +2319,25 @@ msgid "Connect to specified Site Manager site" msgstr "Подключиться к сайту указанному в Менеджере Сайтов" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Соединение установлено" - -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Соединение" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, 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:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 +#, 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:959 +#: ../../locales/../src/engine/proxy.cpp:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Соединяюсь с %s..." @@ -2318,81 +2346,85 @@ msgid "Connection" msgstr "Соединение" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Соединение прервано" -#: ../../locales/../src/interface/queue.cpp:383 +#: ../../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:240 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "Не удалось установить соединение с \"%s\", использую другой адрес." -#: ../../locales/../src/engine/ControlSocket.cpp:924 +#: ../../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:1065 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Превышено время ожидания соединения" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Соединение закрыто" -#: ../../locales/../src/engine/ControlSocket.cpp:1014 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Соединение закрыто сервером" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:294 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Соединение установлено, инициализация TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:319 +#: ../../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:333 +msgid "Connection established, waiting for welcome message." +msgstr "Соединение установлено, ожидание приглашения." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Соединение установлено, ожидание приглашения..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Соединение потеряно" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Соединение не соответствует правилам" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Отказано в соединении" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Соединение отклонено сервером" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Соединение сброшено сетью" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" 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" @@ -2400,48 +2432,48 @@ msgstr[1] "Соединение прервано после %d секунд неактивности" msgstr[2] "Соединение прервано после %d секунд неактивности" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 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:249 msgid "Connection with proxy established, performing handshake..." msgstr "Соединение с прокси установлено, подтверждаю установление связи..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Соединение с сервером закрыто преждевременно." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Не удалось соединиться с тестовым сервером" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:265 -msgid "Convert keyfile" -msgstr "Конвертировать файл с ключем" +#: ../../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:1739 +#: ../../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:1719 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, 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:516 msgid "Copy the URLs of the selected items to clipboard." msgstr "Скопировать ссылки выбранных элементов в буфер обмена." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Невозможно принять подключение: %s" @@ -2451,30 +2483,30 @@ msgid "Could not add connection to Site Manager" msgstr "Невозможно добавить соединение в Менеджер Сайтов" -#: ../../locales/../src/interface/state.cpp:755 +#: ../../locales/../src/interface/state.cpp:750 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:1084 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Невозможно подключиться к серверу: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" 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: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 "Невозможно скопировать адреса" @@ -2482,17 +2514,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 "Невозможно создать мьютекс для логов %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" @@ -2503,11 +2535,11 @@ "Либо расширение не установлено должным образом, либо вы не перетащили файлы " "в окно проводника." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4091 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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 " @@ -2518,11 +2550,11 @@ "Установите каталог данных FileZilla, используя параметр командной строки '--" "datadir <путь_к_каталогу>', либо установите переменную среды FZ_DATADIR" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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" @@ -2530,32 +2562,37 @@ "Невозможно получить имя издателя сертификата, ошибка в " "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:900 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Невозможно получить полный путь." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153 -#: ../../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/edithandler.cpp:1575 -#: ../../locales/../src/interface/search.cpp:712 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../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" @@ -2575,15 +2612,15 @@ "может быть доступен.\n" "Любые изменения, сделанные в Менеджере Сайтов, не будут сохранены." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:220 -msgid "Could not load keyfile" -msgstr "Невозможно загрузить файл с ключем" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Невозможно загрузить файл с ключом" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:290 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Невозможно загрузить секретный ключ" -#: ../../locales/../src/interface/state.cpp:922 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2594,7 +2631,7 @@ "Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/state.cpp:359 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2604,7 +2641,7 @@ "Нет доступа к локальному каталогу, соответствующему удалённому '%s'.\n" "Синхронизированный просмотр был отключен." -#: ../../locales/../src/interface/state.cpp:265 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2615,14 +2652,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" @@ -2635,16 +2672,24 @@ msgid "Could not parse server address:" msgstr "Невозможно разобрать адрес сервера:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Невозможно прочитать данные с сокета данных." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Невозможно получить данные с сокета: %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:2591 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +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 в файле" @@ -2653,25 +2698,25 @@ 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:223 msgid "Could not send command to fzputtygen." msgstr "Невозможно послать команду на fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2619 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Невозможно создать IO поток" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Невозможно подтвердить установление связи с прокси: %s" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Невозможно начать передачу" -#: ../../locales/../src/interface/sitemanager.cpp:608 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2690,7 +2735,7 @@ msgid "Could not write \"%s\", the global bookmarks could no be saved: %s" msgstr "Невозможно записать \"%s\", общая закладка не может быть сохранена: %s" -#: ../../locales/../src/interface/QueueView.cpp:1858 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2699,9 +2744,9 @@ "Невозможно записать \"%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: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" @@ -2711,28 +2756,28 @@ msgid "Could not write \"%s\":" msgstr "Невозможно записать \"%s\":" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:313 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format -msgid "Could not write keyfile: %s" -msgstr "Невозможно записать секретный ключ: %s" +msgid "Could not write key file: %s" +msgstr "Невозможно записать файл с ключом: %s" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../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:983 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "Невозможно записать данные в сокет: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Страна:" @@ -2740,17 +2785,25 @@ msgid "Crea&te new file" msgstr "Созда&ть новый файл" +#: ../../locales/../src/interface/state.cpp:959 +msgid "Create &missing local directory and enter it" +msgstr "Создать &отсутствующий локальный каталог и открыть его" + +#: ../../locales/../src/interface/state.cpp:886 +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:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../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 "Создать подкаталог в текущем каталоге" #: ../../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:503 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 msgid "Create a new subdirectory in the current directory and change into it" msgstr "Создать подкаталог в текущем каталоге и перейти в него" @@ -2760,50 +2813,50 @@ #: ../../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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Create director&y and enter it" msgstr "Создать катало&г и открыть его" -#: ../../locales/../src/interface/LocalListView.cpp:897 +#: ../../locales/../src/interface/LocalListView.cpp:902 #: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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:390 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Создание каталога" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1917 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../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 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" 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:350 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2825,21 +2878,25 @@ msgid "Current transfer type is set to binary." msgstr "Выбран бинарный тип передачи." +#: ../../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 "Произвольный" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Пользовательский набор фильтров" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2364 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Сервер, выбранный пользователем" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2498 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "Т&ип данных" @@ -2847,16 +2904,20 @@ msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)" msgstr "Десятичные префиксы в системе СИ (напр., 1 КБ = 1000 байт)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "П&о умолчанию" #: ../../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:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 msgid "D&elete" msgstr "У&далить" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "Сравнение &каталогов" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "З&апретить все" @@ -2870,7 +2931,7 @@ msgstr "Д&ействие по двойному клику на каталогах:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1250 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "Д&ублировать" @@ -2878,16 +2939,16 @@ msgid "DOS-like with virtual paths" msgstr "В виде DOS с виртуальными путями" -#: ../../locales/../src/interface/edithandler.cpp:1627 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Опасные типы файлов" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Данные" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Сокет данных закрыт слишком рано." @@ -2915,7 +2976,7 @@ msgid "Debugging settings" msgstr "Настройки отладки" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Локальный &каталог по умолчанию:" @@ -2933,11 +2994,11 @@ msgid "Default file exists action" msgstr "Действие по умолчанию, если файл существует" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "У&даленный каталог по умолчанию:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051 +#: ../../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." @@ -2979,12 +3040,12 @@ msgstr[1] "Ожидание подключения в %d секунды после неудачной попытки..." msgstr[2] "Ожидание подключения в %d секунд после неудачной попытки..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1195 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" msgstr "Удалить запись из Менеджера Сайтов" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" msgstr "Удалить выбранный каталог" @@ -3003,15 +3064,7 @@ 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:3211 msgid "Deleting symbolic link" msgstr "Удаление символьной ссылки" @@ -3029,7 +3082,7 @@ msgstr "Детали нового ключа:" #: ../../locales/../src/interface/import.cpp:58 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:742 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 msgid "Detected newer version of FileZilla" msgstr "Доступна новая версия FileZilla" @@ -3037,7 +3090,7 @@ msgid "Dire&ctories" msgstr "Ката&логи" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Направление" @@ -3045,13 +3098,13 @@ msgid "Directory" msgstr "Каталог" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2766 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../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:323 +#: ../../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/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Сравнение каталогов" @@ -3063,11 +3116,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 "Не удалось построить список каталогов" @@ -3075,12 +3128,12 @@ msgid "Directory listing filters" msgstr "Фильтры построения списка каталогов" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Список каталогов \"%s\" извлечен" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Список каталогов извлечен" @@ -3088,14 +3141,14 @@ msgid "Disa&ble all" msgstr "Запр&етить все" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Выключить синхронизированный просмотр и продолжить изменение удалённого " "каталога?" -#: ../../locales/../src/interface/Mainfrm.cpp:660 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3107,23 +3160,23 @@ msgid "Disconnect from server" 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: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 "Отключен от сервера" -#: ../../locales/../src/engine/ControlSocket.cpp:1016 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:906 +#: ../../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:380 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Отключаюсь от предыдущего сервера" @@ -3149,8 +3202,8 @@ msgid "Do the same with &all selected files already being edited" msgstr "Сделать то же самое со &всеми отредактированными файлами" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 -#: ../../locales/../src/interface/Mainfrm.cpp:1170 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Уверены, что хотите закрыть FileZilla?" @@ -3163,7 +3216,7 @@ msgid "Do you really want to delete all Site Manager entries?" msgstr "Уверены, что хотите удалить все записи Менеджера Сайтов?" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1197 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Уверены, что хотите удалить выбранный пункт?" @@ -3171,7 +3224,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Уверены, что хотите удалить задание?" -#: ../../locales/../src/interface/Mainfrm.cpp:599 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Уверены, что хотите отправить '%s' на сервер?" @@ -3180,7 +3233,7 @@ msgid "Do you want to reopen this file?" msgstr "Вы хотите заново открыть этот файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3344 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Документация" @@ -3197,11 +3250,11 @@ msgid "Double-click action" msgstr "Действие по двойному клику" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2207 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "Загрузить" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3546 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 #: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Ограничение &скачивания:" @@ -3215,13 +3268,13 @@ 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:3110 +#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:529 msgid "Download search results" msgstr "Скачать результаты поиска" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:480 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" msgstr "Скачать выбранный каталог" @@ -3229,7 +3282,7 @@ msgid "Download selected files and directories" msgstr "Скачать выбранные файлы и каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:976 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3238,42 +3291,34 @@ "Скорость скачивания: %s/s\n" "Скорость загрузки: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1100 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "Скачиваю" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:337 +#: ../../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:107 -#: ../../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:87 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 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:113 -#: ../../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:93 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Перетаскивание между различными серверами не было выполнено." @@ -3298,7 +3343,13 @@ msgid "E&xit" msgstr "В&ыход" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../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 "&Экспорт..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-Mail:" @@ -3316,17 +3367,17 @@ msgstr "" "Редактировать файл выбранным редактором и загрузить изменения на сервер." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" 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 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Редактирование результатов поиска" @@ -3334,7 +3385,7 @@ msgid "Email:" msgstr "Email:" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Пустая команда" @@ -3342,7 +3393,7 @@ msgid "Empty command." msgstr "Пустая команда." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Пустой список каталогов" @@ -3380,7 +3431,7 @@ msgid "Encrypted" msgstr "Зашифровано" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2035 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Шифрование" @@ -3388,7 +3439,7 @@ msgid "Encryption details" msgstr "Параметры шифра" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Закончить сравнение и изменить порядок сортировки?" @@ -3396,15 +3447,15 @@ msgid "Enter &custom command..." msgstr "Ввести &команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3587 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Введите 0 для отключения ограничения." -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Введите команду" -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Введите произвольную команду" @@ -3418,11 +3469,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 "Введите новое название набора фильтров" @@ -3463,15 +3514,14 @@ "- ftps:// для FTP через SSL (неявным)\n" "- ftpes:// для FTP через SSL (явным)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:270 +#: ../../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" -"Пожалуйста, обратите внимание, что преобразованный файл не будет защищен " -"паролем." +"Преобразованный файл будет защищен тем же паролем." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3481,7 +3531,7 @@ "Введите порт, который прослушивает сервер.\n" "По умолчанию, для FTP это 21, для SFTP это 22" -#: ../../locales/../src/interface/loginmanager.cpp:66 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Введите имя пользователя и пароль" @@ -3494,7 +3544,7 @@ msgid "Error importing" msgstr "Ошибка импорта" -#: ../../locales/../src/interface/QueueView.cpp:1920 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Ошибка загрузки очереди" @@ -3503,50 +3553,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:1841 -#: ../../locales/../src/interface/search.cpp:822 -#: ../../locales/../src/interface/search.cpp:841 +#: ../../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: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/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 "Ошибка загрузки файла xml" -#: ../../locales/../src/interface/QueueView.cpp:1830 +#: ../../locales/../src/interface/QueueView.cpp:1813 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: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: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/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 "Ошибка записи файла 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 "Ошибка:" @@ -3592,7 +3642,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:508 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - Протокол передачи файлов" @@ -3605,7 +3655,7 @@ msgstr "FTP - Небезопасный протокол передачи файлов" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "Движок FTP не инициализирован, невозможно соединиться" @@ -3638,24 +3688,24 @@ 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/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:1920 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Не удалось скопировать или переместить сайты" @@ -3663,49 +3713,53 @@ msgid "Failed to create backup copy of xml file" msgstr "Не удалось создать резервную копию файла xml" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Не удалось создать сокет прослушивания, действие отменено" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4070 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "Не удалось создать сокет прослушивания для активного режима передачи" -#: ../../locales/../src/interface/LocalTreeView.cpp:623 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Не удалось получить путь к каталогу 'Мои документы'" -#: ../../locales/../src/interface/LocalTreeView.cpp:611 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Не удалось получить путь к 'Рабочему столу'" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Не удалось получить peer-адрес контрольного соединения, соединение закрыто!" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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: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:301 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../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/settings/optionspage_connection_sftp.cpp:289 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Не удалось загрузить секретный ключ: %s" @@ -3721,53 +3775,53 @@ msgstr "Не удалось открыть \"%s\" для чтения" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1018 +#: ../../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:1003 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:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Не удалось получить внешний IP-адрес, действие отменено" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "Не удалось получить внешний IP-адрес, используется локальный" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3802 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Не удалось получить локальный IP-адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Не удалось получить локальный IP-адрес, действие отменено" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Не удалось получить внешний IP-адрес." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 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)." @@ -3775,24 +3829,24 @@ "Не удалось установить %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 язык, использую системный по умолчанию" @@ -3801,11 +3855,11 @@ 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:531 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Не удалось записать в файл %s" @@ -3822,7 +3876,7 @@ msgid "Fall back to active mode" msgstr "Возврат в активный режим" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2286 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Фай&л:" @@ -3838,7 +3892,7 @@ msgid "File Types" msgstr "Типы файлов" -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Файловый дескриптор не является сокетом" @@ -3850,7 +3904,7 @@ msgid "File editing" msgstr "Правка файлов" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Файл существует" @@ -3866,9 +3920,9 @@ msgid "File lists" msgstr "Списки файлов" -#: ../../locales/../src/interface/edithandler.cpp:1551 -#: ../../locales/../src/interface/FileZilla.cpp:596 -#: ../../locales/../src/interface/FileZilla.cpp:681 +#: ../../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 "Файл не найден" @@ -3877,52 +3931,52 @@ msgid "File search" msgstr "Поиск файла" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Передача файлa прервана пользователем" -#: ../../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:1147 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Идет передача файлов." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "Файл будет передан с типом данных ASCII." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2522 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 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:205 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "Ошибка FileZilla" @@ -3934,11 +3988,11 @@ "FileZilla может протестировать конфигурацию, чтобы убедиться, что все " "настроено правильно." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3468 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "FileZilla уже подключен к серверу." -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "Необходимо перезапустить FileZilla для смены языка." @@ -3950,12 +4004,12 @@ msgid "Filelist status &bars" msgstr "Строка &состояния" -#: ../../locales/../src/interface/edithandler.cpp:1085 +#: ../../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:38 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:33 msgid "Filename" msgstr "Имя файла" @@ -3963,17 +4017,17 @@ msgid "Filename &filters..." msgstr "Фильтры по названию файлов..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2970 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2159 +#: ../../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 "Невозможно задать имя файла для каталога %s и файла %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Неправильное имя файла" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Имя файла не изменено" @@ -3997,7 +4051,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" @@ -4007,7 +4061,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" @@ -4045,8 +4099,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 "Набор фильтров уже существует" @@ -4060,11 +4114,11 @@ msgid "Filter validation failed" msgstr "Не удалось проверить фильтр" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3051 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Искать &файлы" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3056 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Искать &каталоги" @@ -4081,7 +4135,7 @@ msgid "Fingerprint:" msgstr "Контрольная сумма:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Мастер настройки брандмауэра и маршрутизатора" @@ -4105,7 +4159,7 @@ "Эта сессия будет использовать настройки по умолчанию. Любые изменения в " "настройках не будут сохранены." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:481 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "UTF-8 &принудительно" @@ -4113,7 +4167,7 @@ msgid "Force showing &hidden files" msgstr "Принудительно отображать &скрытые файлы" -#: ../../locales/../src/interface/Mainfrm.cpp:655 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Принудительно отображать скрытые файлы" @@ -4126,12 +4180,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 "Найдена новая %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3368 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Подробная документация" @@ -4139,7 +4193,7 @@ msgid "General" msgstr "Общие" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Общий сбой сервера SOCKS" @@ -4152,12 +4206,12 @@ msgid "Get external IP address from the following URL:" msgstr "Получить внешний IP-адрес со следующией страницы:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3387 +#: ../../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 "Набор фильтров существует. Заменить?" @@ -4165,22 +4219,22 @@ msgid "Global bookmarks" msgstr "Общие закладки" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Ошибка GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" 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 "Ошибка GnuTLS %d в %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Ошибка GnuTLS %d: %s" @@ -4201,7 +4255,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP через TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Хэш:" @@ -4210,17 +4264,17 @@ msgstr "Скрытый" #: ../../locales/../src/interface/resources/xrc/settings.xrc:963 -#: ../../locales/../src/interface/queue.cpp:872 -#: ../../locales/../src/interface/queue.cpp:959 +#: ../../locales/../src/interface/queue.cpp:911 +#: ../../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: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" @@ -4233,11 +4287,11 @@ msgid "Homepage:" msgstr "Домашняя страница:" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Хост недоступен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2026 msgid "Host key fingerprint:" msgstr "Контрольная сумма ключа хоста:" @@ -4249,7 +4303,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Хост начинается с '[', но отсутствует кавычка в конце." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Хост недоступен" @@ -4260,7 +4314,7 @@ msgid "Host:" msgstr "Хост:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:357 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "Часы," @@ -4268,7 +4322,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (например: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6 адреса не поддерживаются вместе с SOCKS4 прокси" @@ -4311,7 +4365,7 @@ msgstr "" "Если смена ключа не была запланирована, обратитесь к администратору сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4319,7 +4373,7 @@ "Если проблема осталась, значит маршрутизатор и/или брандмауэр продолжает " "блокировать FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4337,7 +4391,7 @@ "\".1\" (возможна перезапись старых лог-файлов), после чего создается новый " "лог-файл." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3206 +#: ../../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." @@ -4345,7 +4399,7 @@ "Если символьная ссылка указывает на каталог, FileZilla может удалить эту " "ссылку или удалить связанный с ней каталог." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4353,7 +4407,7 @@ "Если проблема осталась, обратитесь к производителю вашего брандмауэра или " "маршрутизатора." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Если проблема осталась, обратитесь к производителю вашего маршрутизатора." @@ -4389,7 +4443,7 @@ "Нажав 'Тест', FileZilla подключится к probe.filezilla-project.org и проведет " "несколько простых тестов." -#: ../../locales/../src/interface/Mainfrm.cpp:1169 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Если вы закроете FileZilla, изменения не будут сохранены." @@ -4413,7 +4467,7 @@ "Если у вас проблемы с получением списка каталогов или передачей файлов, " "попробуйте сменить режим передачи по умолчанию." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4448,7 +4502,7 @@ "Если вы используете маршрутизатор, убедитесь, что все указанные порты " "доступны компьютеру, на котором запущена FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4509,7 +4563,7 @@ "сервера порт и присоединяется к нему. В этом случае больше настроек не " "понадобится." -#: ../../locales/../src/engine/tlssocket.cpp:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4517,7 +4571,7 @@ "Незавершенная цепочка сертификатов, верхний сертификат не является " "самоподписанным авторизованным сертификатом." -#: ../../locales/../src/interface/queue.cpp:378 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Неправильный пароль" @@ -4529,17 +4583,21 @@ "Информация о последней версии FileZilla не может быть получена. Пожалуйста, " "повторите попытку позже." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 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:730 msgid "Insecure server, it does not support FTP over TLS." msgstr "Небезопасный сервер, не поддерживает FTP через 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:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Интерактивный" @@ -4547,29 +4605,29 @@ msgid "Interface" msgstr "Интерфейс" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Прервано сигналом" -#: ../../locales/../src/engine/ControlSocket.cpp:218 -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Прервано пользователем" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Неправильная длина контента" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:587 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Неправильный ответ HTTP" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" 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." @@ -4577,18 +4635,19 @@ "Принята неправильная последовательность символов, отключение UTF-8. Выберите " "UTF-8 в Менеджере Сайтов, чтобы включить UTF-8 принудительно." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:851 +#: ../../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:363 +#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:380 +#: ../../locales/../src/interface/netconfwizard.cpp:397 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 "Неправильная дата" @@ -4601,7 +4660,7 @@ msgid "Invalid host, after closing bracket only colon and port may follow." msgstr "Неверный хост, после кавычки может стоять только точка и порт." -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Неверные данные" @@ -4626,38 +4685,38 @@ "ftps:// для FTP через SSL (неявным)\n" "ftpes:// для FTP через SSL (явным)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Неверный хост прокси, после закрывающей скобки может следовать только " "двоеточие и порт." -#: ../../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:597 +#: ../../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 "Неверный путь сайта" @@ -4669,23 +4728,23 @@ msgid "Invalid username given." msgstr "Неверное имя пользователя." -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Неверное значение ai_flags" -#: ../../locales/../src/engine/socket.cpp:1084 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Неверное значение hints" -#: ../../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 "Штат или провинция юрисдикции:" @@ -4693,7 +4752,7 @@ msgid "Keep directories on top" msgstr "Показывать сначала каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:659 +#: ../../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 " @@ -4712,6 +4771,13 @@ 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 +msgid "Key file" +msgstr "Файл с ключом" + #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "Н&аименьший" @@ -4721,11 +4787,11 @@ msgid "Language" msgstr "Язык" -#: ../../locales/../src/interface/Mainfrm.cpp:1477 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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" @@ -4755,7 +4821,7 @@ msgid "Limit:" msgstr "Лимит:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:804 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Превышена длина строки" @@ -4763,13 +4829,14 @@ msgid "Linked against" msgstr "Кроме того" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 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:118 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "Список:" @@ -4777,38 +4844,38 @@ msgid "Lo&west available port:" msgstr "Наименьший порт:" -#: ../../locales/../src/interface/edithandler.cpp:1133 -#: ../../locales/../src/interface/edithandler.cpp:1369 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Локальный" -#: ../../locales/../src/engine/socket.cpp:1046 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Локальный адрес уже используется" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Локальная конечная точка была закрыта" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2230 +#: ../../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 "Локальный файл имеет неверное имя." @@ -4820,7 +4887,7 @@ msgid "Local site:" msgstr "Локальный сайт:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Локальность:" @@ -4828,12 +4895,16 @@ msgid "Log file" msgstr "Файл журнала" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +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: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." @@ -4841,7 +4912,7 @@ "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Нельзя " "вернуться к локальной кодировке из-за использования прокси." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4849,7 +4920,7 @@ "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Попытка " "использовать локальную кодировку." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "Последовательность входа выполнена, но войти не удалось. Отменяю." @@ -4867,17 +4938,17 @@ "Тип входа может использоваться вместе с адресом FTP. Параметры должны быть " "'%s' или '%s'" -#: ../../locales/../src/interface/queue.cpp:867 -#: ../../locales/../src/interface/queue.cpp:954 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../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: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." @@ -4889,44 +4960,44 @@ msgid "Make sure the file can be accessed and is a well-formed XML document." msgstr "Убедитесь, что файл доступен и имеет правильный 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/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:737 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Поврежден заголовок: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:557 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 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/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 "Передача вручную" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3010 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Найдено все из следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3011 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Найдено любое из следующего" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3012 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Найдено ничего из следующего" @@ -4934,12 +5005,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Максимум одновременных &передач:" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Ошибка выделения памяти" -#: ../../locales/../src/interface/Mainfrm.cpp:394 -#: ../../locales/../src/interface/Mainfrm.cpp:1804 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Журнал сообщений" @@ -4947,7 +5018,7 @@ msgid "Message log position" msgstr "Позиция журнала сообщений" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Слишком длинное сообщение" @@ -4955,15 +5026,15 @@ msgid "MiB" msgstr "Мб" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:373 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:415 msgid "Minutes" msgstr "Минут" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2145 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" msgstr "Переместить вниз" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" msgstr "Переместить вверх" @@ -4975,9 +5046,9 @@ 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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Мои Сайты" @@ -4986,17 +5057,17 @@ msgid "N/a" msgstr "Нет данных" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2610 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Имя" #: ../../locales/../src/interface/bookmarks_dialog.cpp:679 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1162 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" 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 "Закладка с таким именем уже существует." @@ -5012,19 +5083,19 @@ 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 "Нужно ввести действительный удаленный путь" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1000 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Укажите кодировку символов" -#: ../../locales/../src/engine/socket.cpp:1092 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Не указаны параметры nodename или servername, или не известны" -#: ../../locales/../src/engine/socket.cpp:1079 +#: ../../locales/../src/engine/socket.cpp:1066 msgid "" "Network host does not have any network addresses in the requested address " "family" @@ -5032,8 +5103,8 @@ "Сетевой хост не имеет каких-либо сетевых адресов в запрашиваемом семействе " "адресов" -#: ../../locales/../src/engine/proxy.cpp:490 -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Сеть недоступна" @@ -5049,12 +5120,12 @@ msgid "New &tab" msgstr "Новая &вкладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2808 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" msgstr "Новая &закладка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../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 @@ -5068,14 +5139,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:2070 +#: ../../locales/../src/interface/sitemanager.cpp:695 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2183 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/RemoteListView.cpp:1306 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" msgstr "Новый каталог" @@ -5088,13 +5159,13 @@ msgid "New filter" msgstr "Новый фильтр" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:909 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" 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:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Новый сайт" @@ -5102,11 +5173,11 @@ msgid "Next to the transfer queue" msgstr "Рядом с панелью заданий" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Нет" -#: ../../locales/../src/engine/socket.cpp:1090 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Адрес не ассоциирован с nodename" @@ -5114,15 +5185,15 @@ msgid "No category to export selected" msgstr "Не выбрана категория экспорта" -#: ../../locales/../src/interface/QueueView.cpp:2131 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Не указана команда. Отбой." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3753 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Внешний IP-адрес неустановлен, использую по умолчанию." -#: ../../locales/../src/interface/edithandler.cpp:1074 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Ни один файл сейчас не редактируется." @@ -5140,25 +5211,25 @@ msgid "No images available" msgstr "Нет доступных изображений" -#: ../../locales/../src/interface/QueueView.cpp:2991 +#: ../../locales/../src/interface/QueueView.cpp:2974 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:2975 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Нет программы, ассоциированной с данным типом файлов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2892 +#: ../../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:1066 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Отсутствует маршрут к хосту" @@ -5166,41 +5237,41 @@ 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:484 msgid "No supported SOCKS5 auth method" msgstr "Неподдерживаемый метод авторизации SOCKS5" -#: ../../locales/../src/interface/loginmanager.cpp:102 +#: ../../locales/../src/interface/loginmanager.cpp:101 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:59 +#: ../../locales/../src/interface/verifycertdialog.cpp:61 msgid "None" msgstr "Нет" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2346 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Ничего не выбрано" -#: ../../locales/../src/engine/socket.cpp:1086 +#: ../../locales/../src/engine/socket.cpp:1073 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:870 -#: ../../locales/../src/interface/queue.cpp:957 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1271 +#: ../../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 "Нормальный" @@ -5209,16 +5280,16 @@ msgid "Not all items could be requeued for transfer." msgstr "Не все элементы могут быть доступны для передачи." -#: ../../locales/../src/interface/state.cpp:178 -#: ../../locales/../src/interface/state.cpp:480 +#: ../../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:571 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Нет подключения к серверу." @@ -5226,11 +5297,11 @@ msgid "Not connected." msgstr "Нет соединения." -#: ../../locales/../src/engine/socket.cpp:1107 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Не инициализирован, нужно вызвать WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:657 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Предупреждение: эта особенность поддерживается, только при использовании " @@ -5274,16 +5345,16 @@ #: ../../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/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" @@ -5301,7 +5372,7 @@ "Выбранный режим будет сконфигурирован далее, так же как и режим возврата " "(если включен)." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:834 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Однажды" @@ -5313,11 +5384,11 @@ msgid "Once a week" msgstr "Каждую неделю" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:525 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:541 msgid "Only use plain FTP (insecure)" msgstr "Использовать обычный FTP (небезопасно)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Открыть каталог в системном менеджере файлов" @@ -5346,10 +5417,10 @@ 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:1616 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/LocalListView.cpp:1712 msgid "Opening failed" msgstr "Не удалось открыть" @@ -5372,19 +5443,19 @@ msgid "Operating System:" msgstr "Операционная система:" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Операция уже выполняется" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Операция выполняется" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Операция не поддерживается" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Организация:" @@ -5392,16 +5463,16 @@ msgid "Other SFTP options" msgstr "Другие настройки SFTP" -#: ../../locales/../src/engine/socket.cpp:1102 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Другая системная ошибка" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Другое:" -#: ../../locales/../src/engine/socket.cpp:1052 -#: ../../locales/../src/engine/socket.cpp:1053 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Недостаточно памяти" @@ -5449,7 +5520,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Заменить, если отличается размер или новее" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Собственный тип сборки: %s\n" @@ -5474,7 +5545,7 @@ msgid "P&roxy host:" msgstr "Хост прокси:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "Команда PORT повреждена маршрутизатором или брандмауэром." @@ -5482,18 +5553,18 @@ msgid "Pa&ssive (recommended)" msgstr "Па&ссивный (рекомендуется)" -#: ../../locales/../src/interface/Mainfrm.cpp:2376 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Параметр не является допустимым URL-адресом" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Анализируем %d байт информации о версии.\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../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 "Паро&ль:" @@ -5506,13 +5577,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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:621 msgid "Passive mode has been set as default transfer mode." msgstr "Пассивный режим установлен по умолчанию." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:272 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Требуется пароль" @@ -5521,24 +5592,24 @@ msgid "Path" msgstr "Путь" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3053 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2205 +#: ../../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 "Невозможно задать путь для каталога %s и подкаталога %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2334 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Путь не найден:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2637 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 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:1111 +#: ../../locales/../src/interface/edithandler.cpp:1248 +#: ../../locales/../src/interface/edithandler.cpp:1338 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Pending removal" msgstr "Ожидаю удаления" @@ -5546,8 +5617,8 @@ msgid "Permission" msgstr "Право" -#: ../../locales/../src/engine/socket.cpp:1045 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Доступ запрещен" @@ -5560,7 +5631,7 @@ msgid "Platform:" msgstr "Платформа:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5576,12 +5647,12 @@ "Сконфигурируйте брандмауэр и маршрутизатор так, чтобы FileZilla могла " "установить исходящее соединение с произвольными портами." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Пожалуйста, отключите режимы 'DMZ' и 'Игровой' на вашем маршрутизаторе." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5618,7 +5689,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\"" @@ -5648,7 +5719,7 @@ msgid "Please enter a password for this server:" msgstr "Введите пароль для данного сервера:" -#: ../../locales/../src/interface/QueueView.cpp:2120 +#: ../../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" @@ -5663,7 +5734,7 @@ "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." 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 "Введите уникальное имя для этого набора фильтров" @@ -5671,11 +5742,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 "Введите URL, с которого будет получен ваш внешний IP-адрес" @@ -5687,7 +5758,7 @@ "Пожалуйста, введите ограничение скорости загрузки (больше или равно 0 %s/" "сек)." -#: ../../locales/../src/interface/Mainfrm.cpp:582 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5695,14 +5766,14 @@ "Введите raw FTP команду.\n" "Использование raw команд очищает кэш каталогов." -#: ../../locales/../src/interface/LocalListView.cpp:897 +#: ../../locales/../src/interface/LocalListView.cpp:902 #: ../../locales/../src/interface/LocalTreeView.cpp:1120 -#: ../../locales/../src/interface/RemoteListView.cpp:1297 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1212 +#: ../../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 "Введите имя создаваемого файла:" @@ -5710,12 +5781,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-адрес" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5733,7 +5804,7 @@ "Внимательно следуйте инструкциям, так как неверная конфигурация приведет к " "проблемам с соединением." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5741,11 +5812,11 @@ "Убедитесь, что FileZilla имеет право устанавливать соединение и что " "введенный адрес правильный." -#: ../../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 "Убедитесь, что выбранный язык установлен в системе." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5768,7 +5839,7 @@ "троянами и другими вредоносными программами. Это может вызвать ложный сигнал " "тревоги, который вы можете спокойно отключить." -#: ../../locales/../src/interface/Mainfrm.cpp:697 +#: ../../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." @@ -5784,7 +5855,7 @@ "Учтите, что некоторые серверы могут забанить вас, если вы будете делать " "попытки соединения с очень коротким интервалом." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5794,7 +5865,7 @@ "вас возникнут проблемы с серверами, к которым ранее вы подключались " "нормально." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Пожалуйста, выберите действие:" @@ -5829,7 +5900,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Выберите новые атрибуты для выбранных файлов." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5847,8 +5918,8 @@ msgid "Positio&n of the message log:" msgstr "Позиция &журнала сообщений:" -#: ../../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 "Почтовый индекс:" @@ -5860,12 +5931,12 @@ msgid "Preallocation" msgstr "Резервирование" -#: ../../locales/../src/interface/sitemanager.cpp:268 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1791 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Предустановленные Сайты" -#: ../../locales/../src/interface/Mainfrm.cpp:696 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Сохраняю время создания файлов" @@ -5873,7 +5944,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 "Сертификаты основного соединения и канала данных не соответсвуют." @@ -5889,7 +5960,7 @@ msgid "Prioritize directories (default)" msgstr "Приоритет каталогов (по умолчанию)" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Приоритет" @@ -5919,21 +5990,21 @@ msgid "Process &Queue" msgstr "Выполнить &задание" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Переполнение таблицы для обработки файлов" #. @translator: Example: Processed 5 files in 1 directory -#: ../../locales/../src/interface/recursive_operation_status.cpp:90 +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 #, c-format msgid "Processed %s in %s." msgstr "Обработано %s в %s." -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Протокол не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Протокол не поддерживается данным типом сокета" @@ -5950,36 +6021,40 @@ msgid "Proxy &user:" msgstr "Пользователь прокси" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Аутентификация прокси не удалась" -#: ../../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 "Не установлена связь с прокси: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4208 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Хост прокси начинается с '[', но закрывающая скобка не найдена." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, 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:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Сбой запроса прокси. Ответ от прокси: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Сбой запроса прокси: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Сбой запроса прокси: Неизвестный тип адреса в ответе CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Прокси установлен, но хост или порт прокси недействителен" @@ -5995,7 +6070,7 @@ msgid "Public permissions" msgstr "Публичные права" -#: ../../locales/../src/interface/QueueView.cpp:3071 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Задание полностью завершено" @@ -6014,11 +6089,11 @@ msgid "Queue: empty" msgstr "Задание: пусто" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Файлы в задании" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3147 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Задание:" @@ -6030,12 +6105,12 @@ msgid "R&emote directory tree" msgstr "У&даленный список" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:468 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" msgstr "О&чистить выбранные и получить снова" -#: ../../locales/../src/interface/Mainfrm.cpp:596 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Raw команда FTP" @@ -6052,7 +6127,7 @@ msgid "Re&name" msgstr "Пе&реименовать" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6068,12 +6143,12 @@ msgid "Read-only" msgstr "Только чтение" -#: ../../locales/../src/interface/Mainfrm.cpp:1033 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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 "" @@ -6082,8 +6157,8 @@ msgstr[1] "Удалить %d каталога вместе со всем содержимым с сервера?" msgstr[2] "Удалить %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?" @@ -6091,25 +6166,25 @@ msgstr[1] "Удалить %d файла с сервера?" msgstr[2] "Удалить %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:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Причина" -#: ../../locales/../src/interface/QueueView.cpp:3064 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Перезагрузить сейчас" @@ -6117,36 +6192,36 @@ msgid "Rec&urse into subdirectories" msgstr "Пер&енаправить во вложенные каталоги" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "От сервера получено TLS оповещение: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2964 +#: ../../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:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../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:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Принятые данные повреждены" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Получен недопустимый символ в информации о версии" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:515 msgid "Received version information is too large" msgstr "Полученная информация о версии слишком большая" @@ -6168,25 +6243,25 @@ msgid "Reconnects to the last used server" msgstr "Подключиться к последнему использованному серверу" -#: ../../locales/../src/interface/recursive_operation_status.cpp:72 +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 msgid "Recursively adding files to queue." msgstr "Рекурсивное добавление файлов в очередь." -#: ../../locales/../src/interface/recursive_operation_status.cpp:78 +#: ../../locales/../src/interface/recursive_operation_status.cpp:98 msgid "Recursively changing permissions." msgstr "Рекурсивное изменение разрешений." -#: ../../locales/../src/interface/recursive_operation_status.cpp:75 +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 msgid "Recursively deleting files and directories." msgstr "Рекурсивное удаление файлов и каталогов." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:653 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Перенаправление на неправильный или неподдерживаемый адрес: %s" @@ -6196,28 +6271,28 @@ msgid "Refresh the file and folder lists" msgstr "Обновить список файлов и каталогов" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3680 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Запомнить пароли?" -#: ../../locales/../src/interface/edithandler.cpp:1096 +#: ../../locales/../src/interface/edithandler.cpp:1095 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:2265 -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1210 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/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 "Удаленный поиск файлов" @@ -6225,7 +6300,7 @@ msgid "Remote filters:" msgstr "Удаленные фильтры:" -#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Удаленный путь" @@ -6238,7 +6313,7 @@ "Невозможно разобрать удаленный путь. Убедитесь, что указан верный абсолютный " "путь и что он поддерживается типом сервера (%s) данного сайта." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1079 +#: ../../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 " @@ -6250,17 +6325,17 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:416 #: ../../locales/../src/interface/bookmarks_dialog.cpp:420 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1081 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1117 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:3129 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Удаленный путь:" @@ -6272,13 +6347,13 @@ 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:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" msgstr "Очистить &все" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:450 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:465 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" msgstr "Очистить &выбранные" @@ -6286,12 +6361,12 @@ #: ../../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/asyncrequestqueue.cpp:292 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:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:576 msgid "Rename selected directory" msgstr "Переименовать выбранный каталог" @@ -6300,65 +6375,65 @@ msgid "Rename selected files and directories" msgstr "Переименовать выбранные файлы и каталоги" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3392 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, 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:3422 msgid "Reporting bugs and feature requests" msgstr "Отчет об ошибках и запрос возможностей" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:401 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:395 msgid "Request rejected or failed" msgstr "Запрос отклонен или не удался" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:523 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "Требовать FTP через TLS (явный)" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "Требовать FTP через TLS (неявный)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:461 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" msgstr "Очистить все и получить снова" -#: ../../locales/../src/engine/socket.cpp:1097 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Полученный протокол неизвестен" -#: ../../locales/../src/engine/ControlSocket.cpp:1078 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:468 +#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "Определение IP-адреса для %s" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1043 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:113 +#: ../../locales/../src/interface/netconfwizard.cpp:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Ответ:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3075 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Результаты:" @@ -6378,18 +6453,18 @@ "другой формат конца строки." #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:914 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Получение списка каталогов \"%s\"..." #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Получение списка каталогов..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3768 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Получение внешнего IP-адреса с %s" @@ -6406,7 +6481,7 @@ msgid "S&hutdown system" msgstr "Выключить систему" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Прервать" @@ -6426,7 +6501,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 прокси будет подключаться к: %s" @@ -6435,33 +6510,33 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Сохранить настройки?" -#: ../../locales/../src/interface/manual_transfer.cpp:436 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:962 +#: ../../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/sitemanager_dialog.cpp:964 +#: ../../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:1718 +#: ../../locales/../src/interface/QueueView.cpp:1704 msgid "Scanning for files to add to queue" msgstr "Поиск файлов для добавления в задание" -#: ../../locales/../src/interface/QueueView.cpp:1720 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "Поиск файлов для загрузки на сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3003 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Условия &поиска:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2984 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Поиск каталога:" @@ -6477,13 +6552,13 @@ msgid "Security information" msgstr "Информация о безопасности" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 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:2353 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Выберите сервер" @@ -6500,7 +6575,7 @@ "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:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Выберите редактор по умолчанию" @@ -6521,7 +6596,7 @@ "Выберите действие по умолчанию, если объект существует (только для выбранных " "файлов в задании)" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:347 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:80 msgid "Select file containing private key" msgstr "Выберите файл содержащий личный ключ" @@ -6530,6 +6605,7 @@ msgstr "Выберите файл для экспорта данных" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Выберите файл для экспорта содержимого очереди" @@ -6538,7 +6614,7 @@ msgstr "Выберите файл для экспорта настроек" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2098 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "Выберите файл для экспорта сайтов" @@ -6546,23 +6622,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/settings/optionspage_connection_sftp.cpp:294 -msgid "Select filename for converted keyfile" -msgstr "Выберите название для файла с ключем" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +msgid "Select filename for converted key file" +msgstr "Выберите название для файла с ключом" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2897 +#: ../../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 "Выберите имя файла" @@ -6574,7 +6650,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." @@ -6590,7 +6666,7 @@ msgstr[1] "Выбрано %d каталога." msgstr[2] "Выбрано %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." @@ -6614,7 +6690,7 @@ msgstr[1] "Выбрано %d файла. Размер: не менее %s" msgstr[2] "Выбрано %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 для передачи." @@ -6629,8 +6705,8 @@ msgid "Selected %s and %s. Total size: At least %s" msgstr "Выбраны %s и %s. Размер: не менее %s" -#: ../../locales/../src/interface/edithandler.cpp:1477 -#: ../../locales/../src/interface/edithandler.cpp:1551 +#: ../../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 "Выбранный редактор не существует." @@ -6640,19 +6716,19 @@ msgid "Selected file already being edited" msgstr "Выбранный файл уже редактируется" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:375 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 msgid "Selected file is already loaded" msgstr "Выбранный файл уже загружен" -#: ../../locales/../src/interface/edithandler.cpp:1649 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "Выбранный файл уже открыт" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1720 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 "Выбранный фильтр касается только для локальных файлов." @@ -6677,34 +6753,34 @@ msgstr "" "Отправить индивидуальную команду на сервер, не доступную стандартным способом" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Посылаю команду FTP активности" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Серийный номер:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "Тип &сервера:" -#: ../../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:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Сервер не поддерживает символы не ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "Сервер не поддерживает докачку файлов более %d ГБ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4145 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6721,7 +6797,7 @@ msgid "Server does not support resume of files > 4GB." msgstr "Сервер не поддерживает докачку файлов более 4 ГБ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6730,7 +6806,7 @@ "Сервер может не поддерживать докачку файлов более %d ГБ. Окончить передачу, " "так как размеры файлов совпадают." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6738,11 +6814,11 @@ "Сервер может потребовать учетную запить. Попробуйте указать учетную запись " "используя Менеджер Сайтов" -#: ../../locales/../src/engine/ControlSocket.cpp:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Сервер вернул пустой путь." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:654 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6750,13 +6826,13 @@ "Сервер послал дополнительный запрос на логин. Необходимо использовать " "интерактивный логин." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Сервер отправил пассивный ответ с неопределяемым адресом. Пассивный режим не " "сработал." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3710 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6765,35 +6841,35 @@ "существующий адрес сервера." #: ../../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: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 "Сервер направил неожиданный ответ." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "MAC-адрес сервер-клиент:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Шифр сервер-клиент:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2416 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Тип &сервера:" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Сервер/Локальный файл" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2339 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Сервер:" @@ -6805,13 +6881,13 @@ msgid "Set &Priority" msgstr "Установить &приоритет" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3540 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../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 вызван без указания сокета" @@ -6831,7 +6907,7 @@ msgid "Show &welcome dialog..." msgstr "Показать окно приветствия..." -#: ../../locales/../src/interface/Mainfrm.cpp:2224 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Показать оба дерева каталогов и продолжить сравнение?" @@ -6843,7 +6919,7 @@ 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:441 msgid "Shows available TLS ciphers" msgstr "Показывать доступность TLS шифрования" @@ -6851,7 +6927,7 @@ msgid "Shows this help dialog" msgstr "Показывать это окно помощи" -#: ../../locales/../src/interface/QueueView.cpp:3060 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Выключить систему" @@ -6867,46 +6943,47 @@ msgid "Site Manager" msgstr "Менеджер Сайтов" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:970 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 msgid "Site Manager - Cannot remember password" 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: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: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 "Менеджер Сайтов - Некорректные данные" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:323 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 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 "Неправильный путь к сайту." @@ -6924,7 +7001,7 @@ "Для индивидуальных закладок требуется сохранить сервер в Менеджере Сайтов.\n" "Добавить текущее соединение в Менеджер Сайтов?" -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Размер" @@ -6943,43 +7020,43 @@ 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: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:1153 -#: ../../locales/../src/engine/ControlSocket.cpp:1169 -#: ../../locales/../src/engine/ControlSocket.cpp:1194 -#: ../../locales/../src/engine/ControlSocket.cpp:1254 +#: ../../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:1060 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Адрес сокета за пределами адресного пространства" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Сокет уже подключен" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Сокет был закрыт" -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Сокет не подключен" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Тип сокета не поддерживается для семейства адреса" -#: ../../locales/../src/interface/Mainfrm.cpp:1168 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Некоторые файлы все еще редактируются или требуют закачки на сервер." @@ -6996,7 +7073,7 @@ msgid "Sort directories inline" msgstr "Линейная сортировка каталогов" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Режим сортировки не может быть изменен при сравнении каталогов." @@ -7008,11 +7085,11 @@ msgid "Sorting &mode:" msgstr "Сортировка:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 msgid "Source and path of the drop operation are identical" msgstr "Источник и путь одинаковы" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 msgid "Source and target file may not be the same" msgstr "Источник и место назначения не могут быть одинаковы" @@ -7024,7 +7101,7 @@ msgid "Source file:" msgstr "Исходный файл:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3622 +#: ../../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" @@ -7054,7 +7131,7 @@ msgid "Stable, beta and nightly versions" msgstr "Стабильные, бета и ночные версии" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2547 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" msgstr "Начать передачу немедленно" @@ -7062,19 +7139,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:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1548 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Начинаю скачивать %s" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1551 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Начинаю закачивать %s" @@ -7083,18 +7160,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:1088 -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../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 "Статус:" @@ -7102,11 +7179,11 @@ msgid "Stop and remove &all" msgstr "Остановить и удалить &все" -#: ../../locales/../src/interface/recursive_operation_status.cpp:39 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 msgid "Stop recursive operation" msgstr "Остановить рекурсивную операцию" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Улица:" @@ -7122,11 +7199,11 @@ msgid "Summary of test results:" msgstr "Результаты теста:" -#: ../../locales/../src/interface/QueueView.cpp:3068 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Приостановить сейчас" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7134,23 +7211,24 @@ "Символьные ссылки на файлы не затронуты этим выбором, такие ссылки всегда " "удаляются." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3700 #: ../../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: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:930 +#: ../../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 "Синхронизированный просмотр." -#: ../../locales/../src/interface/state.cpp:368 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Синхронизированный просмотр был отключен." @@ -7164,8 +7242,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Ошибка синтаксиса в командной строке" @@ -7177,11 +7255,11 @@ msgid "System details" msgstr "Сведения о системе" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Превышен системный предел открытых файлов" -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Системная сетевая подсистема не удалась" @@ -7189,19 +7267,19 @@ msgid "T&oolbar" msgstr "П&анель инструментов" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:311 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS соединение установлено, отправка HTTP запроса" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS соединение установлено, ожидаю приветственное сообщение..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS соединение установлено." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL истекло" @@ -7213,15 +7291,15 @@ 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:1081 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Временный сбой в определении имен" @@ -7229,15 +7307,15 @@ msgid "Test results" msgstr "Результаты теста" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4166 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Проверяется возможность докачки с сервера" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:734 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 msgid "The Site Manager cannot be used unless the file gets repaired." msgstr "Для использования Менеджера Сайтов необходимо восстановить файл." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:322 +#: ../../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 " @@ -7255,25 +7333,25 @@ "Менеджер Сайтов открыт другим процессом FileZilla 3.\n" "Закройте его или данные не будут удалены." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Вы ввели адрес: %s" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Член параметра ai_family не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1087 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/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 "Закладки не могут быть очищены." @@ -7299,17 +7377,17 @@ "Формат настраиваемого времени недействителен или содержит неподдерживаемые " "определители формата." -#: ../../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:2915 -#: ../../locales/../src/interface/edithandler.cpp:1512 +#: ../../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:2908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "Редактор текстовых файлов по умолчанию - '%s'." @@ -7320,13 +7398,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: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" @@ -7335,8 +7413,8 @@ "Файл %s существует.\n" "Введите новое имя:" -#: ../../locales/../src/interface/edithandler.cpp:1622 -#: ../../locales/../src/interface/LocalListView.cpp:1699 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7347,7 +7425,16 @@ "Ассоциированная программа (%s) не найдена.\n" "Проверьте настройки ассоциации файлов." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:219 +#: ../../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' нельзя загрузить или он не содержит секретного ключа." @@ -7357,8 +7444,8 @@ msgid "The file '%s' could not be loaded." msgstr "Файл '%s' не может быть загружен." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/LocalListView.cpp:1695 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7367,8 +7454,8 @@ "Файл '%s' нельзя открыть:\n" "Не указана программа, ассоциированная с этим типом файлов." -#: ../../locales/../src/interface/edithandler.cpp:1734 -#: ../../locales/../src/interface/LocalListView.cpp:1707 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7378,7 +7465,7 @@ "Команда не сработала" #: ../../locales/../src/interface/import.cpp:57 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, c-format msgid "" "The file '%s' has been created by a more recent version of FileZilla.\n" @@ -7389,20 +7476,7 @@ "Загрузка файлов более новых версий может привести к потере данных.\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 "" -"Формат файла '%s' не поддерживается FileZilla.\n" -"Кроме того, файл запаролен. FileZilla пока еще не поддерживает файлы ключей, " -"защищенные паролем.\n" -"Хотите преобразовать его в поддерживаемый, незащищенный формат?" - -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:258 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7411,17 +7485,6 @@ "Формат файла '%s' не поддерживается FileZilla.\n" "Хотите преобразовать его в поддерживаемый формат?" -#: ../../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" -"Хотите преобразовать его в незащищенный формат?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Выбранный редактор не существует." @@ -7462,7 +7525,7 @@ msgid "The following files are currently being edited:" msgstr "В данный момент редактируются следующие файлы:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3283 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Бесплатный FTP клиент с открытым исходным кодом" @@ -7483,7 +7546,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Лимит должен быть между 1 и 2000 Мб." -#: ../../locales/../src/interface/state.cpp:248 +#: ../../locales/../src/interface/state.cpp:973 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "Локальный каталог '%s' не может быть создан." + +#: ../../locales/../src/interface/state.cpp:958 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "Локальный каталог '%s' не существует." + +#: ../../locales/../src/interface/state.cpp:250 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7494,7 +7567,7 @@ "Выключить синхронизированный просмотр и продолжить изменение локального " "каталога?" -#: ../../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." @@ -7511,11 +7584,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "Новая версия была сохранена в вашем каталоге загрузок." -#: ../../locales/../src/interface/QueueView.cpp:1840 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Очередь не может быть сохранена." -#: ../../locales/../src/interface/state.cpp:906 +#: ../../locales/../src/interface/state.cpp:885 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "Удалённый каталог '%s' не существует." + +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7540,13 +7618,13 @@ msgid "The selected file is already being edited:" msgstr "Выбранный файл уже редактируется" -#: ../../locales/../src/interface/edithandler.cpp:1721 +#: ../../locales/../src/interface/edithandler.cpp:1720 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:1626 msgid "" "The selected file would be executed directly.\n" "This can be dangerous and might damage your system.\n" @@ -7556,15 +7634,15 @@ "Это опасно и может повредить вашу систему.\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:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Сервер отправил неожиданный или непознанный ответ." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:463 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "The server uses following charset encoding for filenames:" msgstr "Кодировка, используемая сервером:" @@ -7594,7 +7672,7 @@ "Ключ хоста сервера неизвестен. Нет гарантии, что это именно тот сервер, что " "вам нужен." -#: ../../locales/../src/engine/socket.cpp:1099 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Параметр servname не поддерживается для ai_socktype" @@ -7605,20 +7683,20 @@ msgstr "" "Настройки импортированы. Перезапустите FileZilla для применения настроек." -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Указанное семейство адресов не поддерживается" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Указанное сетевое имя больше недоступно" -#: ../../locales/../src/interface/QueueView.cpp:3063 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Система вскоре будет перезагружена, если только вы нажмете кнопку 'Отмена'." -#: ../../locales/../src/interface/QueueView.cpp:3059 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "" "Система вскоре будет выключена, если только вы не нажмете кнопку 'Отмена'." @@ -7631,7 +7709,7 @@ "Файл уже существует.\n" "Выберите действие." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Тест не удался. Уверены, что хотите сохранить настройки?" @@ -7644,15 +7722,15 @@ 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:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7676,7 +7754,7 @@ "Этот мастер поможет вам правильно настроить маршрутизатор и брандмауэр и " "протестировать вашу конфигурацию." -#: ../../locales/../src/interface/queue.cpp:1171 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Время" @@ -7689,25 +7767,25 @@ msgstr "Время ожид&ания, сек.:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:379 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Время ожидания" #: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1022 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Смещение часового пояса сервера составляет %d секунд." -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Название:" -#: ../../locales/../src/interface/Mainfrm.cpp:2222 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "Для сравнения каталогов, оба списка должны быть выровнены." -#: ../../locales/../src/interface/Mainfrm.cpp:2223 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Для этого, оба дерева каталогов должны быть либо скрыты, либо включены." @@ -7771,17 +7849,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Показать/скрыть задание" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:569 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Слишком длинный заголовок" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:644 +#: ../../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 "Трассировка:" @@ -7790,7 +7868,7 @@ msgid "Transfer" msgstr "Передача" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "Направление &передачи" @@ -7806,21 +7884,21 @@ msgid "Transfer Queue" msgstr "Окно задания" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:383 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 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:630 msgid "Transferred data got tainted." msgstr "Преданные данные повреждены." -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Передача" @@ -7829,8 +7907,7 @@ msgid "Transfers" msgstr "Передачи" -#: ../../locales/../src/interface/QueueView.cpp:2961 -#: ../../locales/../src/interface/QueueView.cpp:2964 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Передачи завершены" @@ -7842,11 +7919,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Считать &следующие типы файлов как ASCII:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Принять измененный ключ хоста:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:818 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Принять новый ключ хоста:" @@ -7867,8 +7944,8 @@ 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:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Тип" @@ -7884,7 +7961,7 @@ msgid "U&pload" msgstr "Загрузить на сервер" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 #: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" msgstr "О&граничение загрузки:" @@ -7894,35 +7971,35 @@ msgstr "Для открытия использовать ассоциации файлов" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Использовать системные настройки" +msgid "U&se system defaults for current language" +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:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Неопределенный код ошибки %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Объект:" -#: ../../locales/../src/interface/edithandler.cpp:1118 -#: ../../locales/../src/interface/edithandler.cpp:1146 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Неизвестен" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Неизвестный тип FTP прокси, невозможно сгенерировать последовательность для " "входа." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Неопределенная версия протокола SOCKS: %d" @@ -7935,7 +8012,7 @@ msgid "Unknown host key" msgstr "Неизвестный ключ" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7949,8 +8026,8 @@ "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: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." @@ -7958,7 +8035,7 @@ "Если не исправить эти проблемы, активный режим FTP не будет работать и нужно " "будет использовать пассивный режим." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -7966,11 +8043,11 @@ "Если не исправить эту проблему, активный режим FTP не будет работать и нужно " "будет использовать пассивный режим." -#: ../../locales/../src/engine/tlssocket.cpp:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Тип сертификата не поддерживается" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:629 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Перенаправление не поддерживается" @@ -7983,11 +8060,11 @@ msgid "Updates" msgstr "Обновления" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" msgstr "Закачать" -#: ../../locales/../src/interface/edithandler.cpp:1109 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" msgstr "Загрузка не удалась" @@ -8000,7 +8077,7 @@ msgid "Upload limit: none" msgstr "Ограничение загрузки: нет" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:539 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" msgstr "Загрузить выбранный каталог" @@ -8016,23 +8093,23 @@ msgid "Upload this file to the server?" msgstr "Загрузить файл на сервер?" -#: ../../locales/../src/interface/edithandler.cpp:1103 -#: ../../locales/../src/interface/edithandler.cpp:1137 -#: ../../locales/../src/interface/edithandler.cpp:1293 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "Загрузка" -#: ../../locales/../src/interface/edithandler.cpp:1106 -#: ../../locales/../src/interface/edithandler.cpp:1295 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" msgstr "Загрузка и ожидание удаления" -#: ../../locales/../src/interface/edithandler.cpp:1140 -#: ../../locales/../src/interface/edithandler.cpp:1297 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" msgstr "Загрузка без изменений" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Использовать &указанную кодировку" @@ -8040,16 +8117,16 @@ msgid "Use &custom editor:" msgstr "Использовать &следующий редактор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Использовать &редактор по умолчанию" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2687 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Использовать с&инхронизированный просмотр" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 msgid "Use UTF-8 if the server supports it, else use local charset." msgstr "" "Использовать UTF-8 если сервер поддерживает, иначе использовать локальную " @@ -8060,21 +8137,21 @@ msgid "Use default action" msgstr "Использовать по умолчанию" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:522 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 msgid "Use explicit FTP over TLS if available" msgstr "Использовать явный FTP через TLS если доступен" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2322 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Использовать сервер к которому подключены" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2328 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Использовать сервер из Менеджера Сайтов" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Использовать системные настройки" +msgid "Use system &defaults for current language" +msgstr "И&спользовать системные настройки текущего языка" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8111,12 +8188,12 @@ msgid "User:" msgstr "Пользователь:" -#: ../../locales/../src/interface/manual_transfer.cpp:494 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028 +#: ../../locales/../src/interface/manual_transfer.cpp:495 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1044 msgid "Username cannot be a series of spaces" msgstr "Имя пользователя не может состоять из одних пробелов" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:514 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8135,7 +8212,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Подробные сообщения журнала wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Проверка сертификата..." @@ -8151,7 +8228,7 @@ msgid "View/Edit" msgstr "Просмотр/Правка" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Видимые колонки" @@ -8159,15 +8236,15 @@ msgid "W&rite" msgstr "З&апись" -#: ../../locales/../src/interface/QueueView.cpp:1678 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Ожидание" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Ожидание соединения для просмотра" -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Ожидание пароля" @@ -8179,7 +8256,7 @@ msgid "Waiting to retry..." msgstr "Ожидание повтора..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Внимание, игнорирую соединение с неправильного IP." @@ -8201,11 +8278,11 @@ msgid "Warning: Potential security breach!" msgstr "Внимание! Обнаружена уязвимость в системе защиты!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3447 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Добро пожаловать в FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Что нового" @@ -8213,7 +8290,7 @@ msgid "What's new:" msgstr "Что нового:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3637 +#: ../../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." @@ -8238,7 +8315,7 @@ msgid "Widescreen" msgstr "Широкоэкранный" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3632 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" msgstr "Н&е сохранять пароли" @@ -8246,20 +8323,20 @@ msgid "Wr&ite" msgstr "За&пись" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Неправильный внешний IP-адрес" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Неправильные концы строк" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:832 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Да" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8271,7 +8348,7 @@ 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:3439 msgid "You can always open this dialog again through the help menu." msgstr "Вы всегда можете открыть это окно снова из меню." @@ -8305,16 +8382,16 @@ "Нельзя заменять недопустимый символ на другой недопустимый. Пожалуйста, " "введите символ допустимый в именах файлов." -#: ../../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 "Вы не указали новое название файла. Заменить файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "Вы выбрали по крайней мере одну символьную ссылку." -#: ../../locales/../src/interface/edithandler.cpp:1588 -#: ../../locales/../src/interface/search.cpp:725 +#: ../../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?" @@ -8322,7 +8399,7 @@ "Вы выбрали более 10 файлов для редактирования, вы действительно хотите " "продолжить?" -#: ../../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?" @@ -8330,35 +8407,39 @@ "Вы выбрали более 10 файлов или каталогов для открытия, вы действительно " "хотите продолжить?" -#: ../../locales/../src/interface/manual_transfer.cpp:414 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:938 +#: ../../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/search.cpp:518 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +msgid "You have to enter a key file path" +msgstr "Укажите путь к файлу с ключом." + +#: ../../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-адрес." +#: ../../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/sitemanager_dialog.cpp:1038 +#: ../../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/sitemanager_dialog.cpp:1013 +#: ../../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:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8374,7 +8455,7 @@ msgid "You need to enter a name for the log file." msgstr "Введите название лог-файла." -#: ../../locales/../src/interface/edithandler.cpp:1473 +#: ../../locales/../src/interface/edithandler.cpp:1472 msgid "You need to enter a properly quoted command." msgstr "Необходимо ввести правильно сформулированную команду." @@ -8389,14 +8470,13 @@ #: ../../locales/../src/interface/bookmarks_dialog.cpp:75 #: ../../locales/../src/interface/bookmarks_dialog.cpp:429 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1091 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1127 msgid "You need to enter at least one path, empty bookmarks are not supported." -msgstr "" -"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:1098 +#: ../../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." @@ -8404,7 +8484,7 @@ "Необходимо ввести локальный и удалённый путь, чтобы включить " "синхронизированный просмотр для этой закладки." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1060 +#: ../../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." @@ -8412,23 +8492,23 @@ "Необходимо ввести локальный и удалённый путь, чтобы включить " "синхронизированный просмотр для этого сайта." -#: ../../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:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8436,7 +8516,7 @@ "У вас не должно возникнуть проблем при соединении с другими серверами. " "Соединение должно работать нормально." -#: ../../locales/../src/interface/QueueView.cpp:3067 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "" "Система вскоре будет перезагружена, если только вы нажмете кнопку 'Отмена'." @@ -8462,7 +8542,7 @@ msgid "contains" msgstr "содержит" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "другая" @@ -8484,19 +8564,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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "файл" -#: ../../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:96 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:120 +#: ../../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 " @@ -8506,15 +8586,15 @@ "Убедитесь, что файл программы находится в том же каталоге, что и FileZilla." "ехе." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:462 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp принадлежит другой версии FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1475 +#: ../../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 вернула отсутствие сертификатов" @@ -8570,11 +8650,11 @@ 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: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 "неизвестен" @@ -8594,6 +8674,50 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Empty dirs to visit" +#~ msgstr "Пустые каталоги для посещения" + +#~ msgid "Connected" +#~ msgstr "Соединение установлено" + +#~ msgid "Deleting directories" +#~ 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 "" +#~ "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" +#~ "Хотите преобразовать его в поддерживаемый, незащищенный формат?" + +#~ 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" +#~ "Хотите преобразовать его в незащищенный формат?" + +#~ msgid "U&se system defaults" +#~ msgstr "Использовать системные настройки" + +#~ msgid "Use system &defaults" +#~ msgstr "Использовать системные настройки" + #~ msgid "The XML document is not well-formed: %s" #~ msgstr "XML-документ имеет не верный формат: %s" diff -Nru filezilla-3.14.1/locales/sv.po filezilla-3.15.0.2/locales/sv.po --- filezilla-3.14.1/locales/sv.po 2015-09-09 14:05:02.000000000 +0000 +++ filezilla-3.15.0.2/locales/sv.po 2016-02-05 08:54:46.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2015-09-04 22:13+0100\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-26 14:47+0100\n" "Last-Translator: Magnus Hovén \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -48,9 +48,9 @@ msgstr[0] "%d katalog" msgstr[1] "%d kataloger" -#: ../../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" @@ -59,9 +59,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" @@ -82,12 +82,12 @@ msgstr[0] "%d fil. Total storlek: Minst %s" msgstr[1] "%d filer. Total storlek: Minst %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -127,7 +127,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Certifikatet förfallet!" @@ -159,7 +159,7 @@ msgstr[0] "%s byte" msgstr[1] "%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 " @@ -173,7 +173,7 @@ "\n" "Hämta FileZilla igen. Om detta problem kvarstår, skicka en felrapport." -#: ../../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 " @@ -191,7 +191,7 @@ "PATH.\n" "- Ställ in fullständig sökväg till %s i miljövariablen FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s med %d bitar" @@ -205,7 +205,7 @@ msgid "%w - Proxy password" msgstr "%w - Proxylösenord" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Avbryt föregående anslutning och anslut i aktuell flik" @@ -258,7 +258,7 @@ msgid "&Always use default editor" msgstr "Använd alltid &standardredigeraren" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Använd alltid detta val för oassocierade filer" @@ -296,9 +296,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 @@ -311,8 +311,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" @@ -385,14 +385,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 "&Ta bort" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Ta bort symbolisk länk" @@ -400,13 +400,13 @@ msgid "&Directory comparison" msgstr "&Katalogjämförelse" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "&Inaktivera synkroniserad bläddring och fortsätt byta fjärrkatalogen" @@ -431,7 +431,7 @@ msgid "&Display size in bytes" msgstr "&Visa storlek i bytes" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Kom &inte ihåg lösenord (rekommenderat)" @@ -452,7 +452,7 @@ msgid "&Download" msgstr "&Hämta" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Hämta till:" @@ -485,7 +485,7 @@ msgid "&Enable compression" msgstr "Aktiv&era komprimering" -#: ../../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 "A&ktivera hastighetsgränser" @@ -502,7 +502,7 @@ msgid "&Enter custom command..." msgstr "&Ange anpassat kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Etablera anslutning i en ny flik" @@ -555,7 +555,7 @@ msgid "&Finish editing and delete local file" msgstr "&Slutför redigering och ta bort den lokala filen" -#: ../../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" @@ -563,7 +563,7 @@ "&Platta till fjärrsökvägarna, hämta alla innehållande filer direkt till " "målkatalogen" -#: ../../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ölj den symboliska länken, ta bort innehållet i målkatalogen" @@ -626,7 +626,7 @@ msgid "&Install new version" msgstr "&Installera ny version" -#: ../../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 "&Behåll strukturen för fjärrsökvägen relativ jämte sökroten" @@ -651,7 +651,7 @@ msgstr "&Lokalt katalogträd" #: ../../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 "&Lokal katalog:" @@ -715,11 +715,11 @@ msgid "&New Site" msgstr "&Ny plats" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Ny version finns tillgänglig!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Nästa >" @@ -742,7 +742,7 @@ msgstr "&Numeriskt värde:" #: ../../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 "&OK" @@ -819,12 +819,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Kom ihåg lösenordet tills FileZilla avslutas" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "&Komma ihåg lösenord" #: ../../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 "&Fjärrkatalog:" @@ -845,7 +845,7 @@ msgstr "&Ta bort markerad" #: ../../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 @@ -906,7 +906,7 @@ msgid "&Save as..." msgstr "&Spara som..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Sök" @@ -975,7 +975,7 @@ msgid "&Speed limits" msgstr "&Hastighetsgränser" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Starta överföringen genast" @@ -987,7 +987,7 @@ msgid "&TLS Ciphers" msgstr "&TLS-chiffer" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Testa" @@ -1030,7 +1030,7 @@ msgid "&Uploads:" msgstr "&Sändningar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Använd anpassat program" @@ -1064,7 +1064,7 @@ msgid "&Username:" msgstr "&Användarnamn:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Version %s" @@ -1109,12 +1109,12 @@ msgid "'%s' is not a directory." msgstr "\"%s\" är ingen katalog." -#: ../../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 "Inloggningstypen \"Account\" stöds inte av valt protokoll" -#: ../../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." @@ -1130,7 +1130,7 @@ "Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga. Din post " "har ändrats till \"Fråga efter lösenord\"." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1188,8 +1188,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(exempel: %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 @@ -1248,7 +1248,7 @@ msgid "64-bit system" msgstr "64-bitars system" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Tillbaka" @@ -1269,7 +1269,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "En katalog kan inte dras till en av dess underkataloger." @@ -1297,7 +1297,7 @@ msgstr "" "En fil med det namnet redigeras fortfarande. Stäng den och försök igen." -#: ../../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 " @@ -1316,7 +1316,7 @@ msgid "A new version of FileZilla is available:" msgstr "En ny version av FileZilla finns tillgänglig:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1333,7 +1333,7 @@ "En korrekt server kräver inte detta. Kontakta administratören av servern om " "du behöver detta." -#: ../../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?" @@ -1385,11 +1385,11 @@ #: ../../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: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" @@ -1415,7 +1415,7 @@ msgid "Active mode" msgstr "Aktivt läge" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1423,7 +1423,7 @@ "FTP-test av aktivt läge misslyckades. FileZilla känner inte till den " "korrekta externa IP-adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1432,7 +1432,7 @@ "korrekta externa IP-adressen. Dessutom har din router ändrat på den utgående " "adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1446,7 +1446,7 @@ msgid "Active mode IP" msgstr "IP-adress för aktivt läge" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Lägg bara till filer i &kön" @@ -1465,7 +1465,7 @@ msgid "Add to queue" msgstr "Lägg till i kön" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Adresstypen stöds inte" @@ -1487,7 +1487,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "An&vänd alltid denna åtgärd" @@ -1495,7 +1495,7 @@ msgid "Algorithm:" msgstr "Algoritm:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Alla filer har överförts med lyckat resultat" @@ -1504,7 +1504,7 @@ msgstr "" "Alla portar i det angivna intervallet måste vara mellan 1024 och 65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../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." @@ -1519,11 +1519,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:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Redan ansluten" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Alternativt namn:" @@ -1553,7 +1553,7 @@ "Alternativt kan du också hämta den senaste versionen ifrån FileZillas " "hemsida:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1562,7 +1562,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:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1571,7 +1571,7 @@ "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: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." @@ -1579,16 +1579,16 @@ "Ett objekt med samma namn som objektet som dras finns redan på målplatsen." #: ../../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/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:943 +#: ../../locales/../src/interface/state.cpp:937 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." @@ -1597,11 +1597,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 msgid "Any changes made to the filters could not be saved." msgstr "Ändringar av filtren kunde inte sparas." -#: ../../locales/../src/interface/filter.cpp:969 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Ändringar av filtren kommer inte att sparas." @@ -1625,7 +1625,7 @@ msgid "Archive" msgstr "Arkiv" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Överflöde i argumentbufferten" @@ -1643,7 +1643,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Fråga efter lösenord" @@ -1655,7 +1655,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Ställ frågor i FileZillas forum" @@ -1675,9 +1675,9 @@ msgid "Attribute" msgstr "Attribut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." -msgstr "Autentiseringen misslyckades" +msgstr "Autentiseringen misslyckades." #: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" @@ -1704,11 +1704,11 @@ msgid "B&ypass proxy" msgstr "&Kringgå proxyn" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Felaktig filbeskrivare" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Grundläggande användarinstruktioner" @@ -1721,7 +1721,7 @@ msgid "Being edited" msgstr "Redigeras" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Se upp! Certifikatet har återkallats" @@ -1739,11 +1739,11 @@ msgid "Bookmark" msgstr "Bokmärke" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Bokmärke:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Bokmärken" @@ -1759,7 +1759,7 @@ msgid "Build information" msgstr "Bygginformation" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Verksamhetskategori:" @@ -1798,22 +1798,22 @@ msgid "CPU features:" msgstr "CPU-funktioner:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Beräknar serverns tidzonsskillnad..." -#: ../../locales/../src/engine/transfersocket.cpp:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Kan inte läsa från filen" -#: ../../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 "Kan inte skriva data till filen." -#: ../../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 "Kan inte skriva data till filen: %s" @@ -1831,13 +1831,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 "Avbryt" @@ -1857,15 +1857,15 @@ "Kan inte komma åt \"%s\", inget media har matats in eller enheten är inte " "redo." -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Kan inte lägga till servern i Platshanteraren" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Kan inte tilldela begärd adress" -#: ../../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?" @@ -1887,20 +1887,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 "Kan inte redigera filen" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 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:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Kan inte redigera filen, okänd fjärrsökväg." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1917,11 +1917,11 @@ msgid "Cannot load key file" msgstr "Kan inte läsa in nyckelfilen" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Kan inte läsa in verktygsfält från resursfil" -#: ../../locales/../src/interface/manual_transfer.cpp:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Kan inte komma ihåg lösenord" @@ -1930,21 +1930,21 @@ msgid "Cannot rename entry" msgstr "Kan inte byta namn på posten" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Kan inte byta namn på filen" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Kan inte spara filteruppsättningen" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Filtret kan inte väljas" @@ -2011,7 +2011,7 @@ msgid "Changing logfile settings requires restart of FileZilla." msgstr "Att ändra loggfilsinställningarna kräver att FileZilla startas om." -#: ../../locales/../src/interface/FileZilla.cpp:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Teckenkodningsproblem" @@ -2037,9 +2037,9 @@ #: ../../locales/../src/interface/update_dialog.cpp:57 msgid "Check for updates failed" -msgstr "Sökningen efter uppdateringar misslyckades." +msgstr "Sökningen efter uppdateringar misslyckades" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2047,7 +2047,7 @@ "Kontrollera inloggningsuppgifterna. Det angivna lösenordet börjar eller " "slutar med ett blankstegstecken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2055,7 +2055,7 @@ "Kontrollera inloggningsuppgifterna. Det angivna användarnamnet börjar eller " "slutar med ett blankstegstecken." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Söker efter den korrekta externa IP-adressen" @@ -2063,12 +2063,12 @@ msgid "Checking for updates..." msgstr "Söker efter uppdateringar..." -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "Kontrollsumman stämmer för filen %s\n" -#: ../../locales/../src/interface/updater.cpp:711 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "Kontrollsumman stämmer inte för filen %s\n" @@ -2083,11 +2083,11 @@ #: ../../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 "Välj den lokala katalogen" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Chunk-data felaktigt avslutad" @@ -2125,7 +2125,7 @@ msgid "Clear quickconnect bar" msgstr "Töm snabbanslutningsraden" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Klicka på Slutför för att spara din konfiguration." @@ -2142,8 +2142,8 @@ msgstr "Stäng &alla andra flikar" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Stäng FileZilla" @@ -2172,13 +2172,13 @@ msgstr "" "Kommandot och dess argument skall vara korrekt angivna med citationstecken." -#: ../../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 "Kommandot misslyckades" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Kommandot stöds inte" @@ -2186,9 +2186,9 @@ msgid "Command not supported by this protocol" msgstr "Kommandot stöds inte av det här protokollet" -#: ../../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 "Kommando:" @@ -2196,12 +2196,12 @@ msgid "Comment" msgstr "Kommentar" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" msgstr "Namn:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Anslutningen påverkad av en router eller brandvägg" @@ -2248,7 +2248,7 @@ msgstr "Samtidiga överföringar" #: ../../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 "Villkoren är skiftläges&känsliga" @@ -2264,24 +2264,24 @@ msgid "Configure port range" msgstr "Konfigurera portintervall" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Konfigurera FileZilla och ditt nätverk" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Bekräfta borttagning" -#: ../../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 "Bekräftelse krävs" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "Gratulerar, din konfiguration verkar fungera." @@ -2289,6 +2289,11 @@ msgid "Connect bypassing proxy settings" msgstr "Anslut men kringgå proxyinställningar" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Anslutningen misslyckades: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Anslut i aktuell flik" @@ -2301,29 +2306,25 @@ msgid "Connect to specified Site Manager site" msgstr "Anslut till angiven plats i Platshanteraren" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:906 -msgid "Connected" -msgstr "Ansluten" - -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Ansluter" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Ansluter till %s genom %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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Ansluter till %s..." @@ -2332,120 +2333,124 @@ msgid "Connection" msgstr "Anslutning" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Anslutningen avbröts" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Anslutningsförsöket misslyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "Försöket att ansluta till \"%s\" misslyckades." -#: ../../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 "Anslutningsförsöket avbröts av användaren" -#: ../../locales/../src/engine/socket.cpp:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Tidsgränsen för anslutningsförsöket överstegs" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Anslutningen stängd" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Anslutningen stängdes av servern" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Anslutningen etablerad, initierar TLS..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Anslutningen etablerad, skickar HTTP-begäran" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Anslutningen etablerad, väntar på välkomstmeddelande." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Anslutningen etablerad, väntar på välkomstmeddelande..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Anslutningen tappad" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Anslutningen tillåts inte av regeluppsättningen" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Anslutningen nekades" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Anslutningen nekades av servern" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Anslutningen återställdes av nätverket" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Anslutningen återställdes av andra parten" -#: ../../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] "Anslutningens tidsgräns överstegs efter %d sekunds inaktivitet" msgstr[1] "Anslutningens tidsgräns överstegs efter %d sekunders inaktivitet" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Tidsgränsen för anslutningen överstegs." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Anslutningen till servern tappad." -#: ../../locales/../src/engine/proxy.cpp:226 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Anslutningen till proxyn är etablerad, handskakning utförs..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Anslutningen till servern stängdes förtidigt." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Anslutningen till testservern misslyckades." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 msgid "Convert key file" msgstr "Konvertera nyckelfil" #: ../../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 "Kopia (%d) av %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 "Kopia av %s" @@ -2455,7 +2460,7 @@ 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:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Kunde inte tillåta anslutningen: %s" @@ -2465,30 +2470,30 @@ msgid "Could not add connection to Site Manager" msgstr "Kunde inte lägga till anslutningen i Platshanteraren" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Kunde inte slutföra åtgärden" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Kunde inte ansluta till servern" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "Kunde inte ansluta till servern: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Kunde inte konvertera kommandot till serverns kodning" -#: ../../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 "Kunde inte konvertera den privata nyckeln" -#: ../../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 "Kunde inte kopiera URL:erna" @@ -2496,17 +2501,17 @@ msgid "Could not copy data" msgstr "Kunde inte kopiera data" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "Kunde inte skapa den lokala filen %s\n" -#: ../../locales/../src/engine/logging.cpp:165 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Kunde inte skapa loggningsmutex: %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" @@ -2517,11 +2522,11 @@ "Antingen är skaltillägget inte installerat korrekt eller så släppte du inte " "filen i ett Utforskar-fönster." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Kunde inte etablera en anslutning till servern" -#: ../../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 " @@ -2533,11 +2538,11 @@ "kommandoradsflaggan \"--datadir \" eller genom att ställa " "in miljövariabeln FZ_DATADIR." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "Kunde inte skapa anpassad inloggningssekvens." -#: ../../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" @@ -2545,7 +2550,7 @@ "Fick inget unikt namn för certifikatsutfärdaren, gnutls_x509_get_issuer_dn " "misslyckades" -#: ../../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" @@ -2553,32 +2558,37 @@ "Fick inget unikt namn för certifikatsobjektet, gnutls_x509_get_dn " "misslyckades" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 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: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 "Fick inget svar ifrån 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 "Kunde inte komma åt den temporära katalogen för filhämtning." -#: ../../locales/../src/engine/tlssocket.cpp:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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 initialisera strukturen för andra partens certifikat, " +"Kunde inte initiera strukturen för andra partens certifikat, " "gnutls_x509_crt_init misslyckades" #: ../../locales/../src/interface/import.cpp:105 @@ -2597,11 +2607,11 @@ msgid "Could not load key file" msgstr "Kunde inte läsa in nyckelfilen" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Kunde inte läsa in den privata nyckeln" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2612,7 +2622,7 @@ "\".\n" "Inaktivera synkroniserad bläddring och fortsätta byta fjärrkatalogen?" -#: ../../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 " @@ -2623,7 +2633,7 @@ "\".\n" "Synkroniserad bläddring har inaktiverats." -#: ../../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 " @@ -2635,14 +2645,14 @@ "Synkroniserad bläddring har inaktiverats." #: ../../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 "Kunde inte öppna urklipp" -#: ../../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 "Kunde inte öppna loggfilen: %s" @@ -2655,42 +2665,50 @@ msgid "Could not parse server address:" msgstr "Kunde inte tolka serveradressen:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Kunde inte läsa från datasockeln." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Kunde inte läsa från sockeln: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Kunde inte läsa serverobjektet." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +msgid "Could not receive data from server." +msgstr "Kunde inte ta emot data från servern." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 #, 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:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Kunde inte skicka kommandot till fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "Kunde inte starta I/O-tråd" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Kunde inte starta handskakningen med proxyn: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Kunde inte starta överföring" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2711,7 +2729,7 @@ msgstr "" "Kunde inte skriva till \"%s\", de globala bokmärkena kunde inte sparas: %s" -#: ../../locales/../src/interface/QueueView.cpp:1850 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2720,9 +2738,9 @@ "Kunde inte skriva till \"%s\", kön kunde inte sparas.\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 "" @@ -2733,28 +2751,28 @@ msgid "Could not write \"%s\":" msgstr "Kunde inte skriva till \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, c-format msgid "Could not write key file: %s" msgstr "Kunde inte skriva till nyckelfilen: %s" -#: ../../locales/../src/interface/queue.cpp:331 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Kunde inte skriva till den lokala filen" -#: ../../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 "Kunde inte skriva till loggfilen: %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 "Kunde inte skriva till sockeln: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Land:" @@ -2762,11 +2780,11 @@ msgid "Crea&te new file" msgstr "S&kapa ny fil" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 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:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Skapa fjärrkatalog so&m saknas och gå in i den" @@ -2795,45 +2813,45 @@ msgid "Create director&y and enter it" msgstr "Skapa &katalog och gå in i den" -#: ../../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 "Skapa katalog" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Skapa tom fil" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Skapar katalog" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Skapar katalogen \"%s\"..." -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kritiskt fel" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kritiskt fel:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kritiskt filöverföringsfel" -#: ../../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 "Kritiskt filöverföringsfel efter att ha överfört %s på %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" @@ -2863,7 +2881,7 @@ msgid "Cus&tom" msgstr "An&passad" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Anpassad filteruppsättning" @@ -2890,6 +2908,10 @@ msgid "D&elete" msgstr "&Ta bort" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "K&atalogjämförelse" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "&Inaktivera allt" @@ -2903,7 +2925,7 @@ msgstr "Åtgärd vid d&ubbelklick på kataloger:" #: ../../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 "&Kopiera" @@ -2919,8 +2941,8 @@ msgid "Data" msgstr "Data" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Datasockeln stängdes för tidigt." @@ -3041,19 +3063,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Tar bort %u filer från \"%s\"" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Tar bort kataloger" - -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Borttagning av flera orelaterade kataloger stöds ännu inte" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Tar bort den symboliska länken" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Skrivbord" @@ -3075,7 +3089,7 @@ msgid "Dire&ctories" msgstr "Katalo&ger" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Riktning" @@ -3083,13 +3097,13 @@ msgid "Directory" msgstr "Katalog" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Katalogjämförelse" @@ -3102,11 +3116,11 @@ msgstr "" "Katalogen innehållandes loggfilen finns inte eller är filnamnet felaktigt." -#: ../../locales/../src/engine/ControlSocket.cpp:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Kataloglistningen avbröts av användaren" -#: ../../locales/../src/interface/RemoteListView.cpp:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Kataloglistningen mislyckades" @@ -3114,12 +3128,12 @@ msgid "Directory listing filters" msgstr "Kataloglistningsfilter" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Kataloglistningen av \"%s\" lyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Kataloglistningen lyckades" @@ -3127,12 +3141,12 @@ msgid "Disa&ble all" msgstr "Ina&ktivera allt" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3144,23 +3158,23 @@ msgid "Disconnect from server" msgstr "Koppla från servern" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Frånkopplad från servern" -#: ../../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 "Frånkopplad från servern: %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 "Kopplar från föregående server" @@ -3186,8 +3200,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Vill du verkligen stänga FileZilla?" @@ -3209,7 +3223,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Vill du verkligen ta bort överföringskön?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Vill du verkligen skicka \"%s\" till servern?" @@ -3218,7 +3232,7 @@ msgid "Do you want to reopen this file?" msgstr "Vill du öppna den här filen igen?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Dokumentation" @@ -3238,7 +3252,7 @@ msgid "Download" msgstr "Hämta" -#: ../../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 "Gräns för hä&mtning:" @@ -3252,9 +3266,9 @@ msgid "Download limit: none" msgstr "Gräns för hämtning: ingen" -#: ../../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 "Hämta sökresultat" @@ -3266,7 +3280,7 @@ msgid "Download selected files and directories" msgstr "Hämta markerade filer och kataloger" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3279,26 +3293,18 @@ msgid "Downloading" msgstr "Hämtar" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Hämtar %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Hämtning av flera orelaterade kataloger stöds ännu inte" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Hämtar sökresultat" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Hämtar uppdatering..." -#: ../../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 "" @@ -3308,9 +3314,9 @@ "Dra och s&läpp mellan olika instanser av FileZilla har ännu inte " "implementerats." -#: ../../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." @@ -3343,7 +3349,7 @@ msgid "E&xport..." msgstr "E&xportera..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-postadress:" @@ -3362,16 +3368,16 @@ "Redigera filen med den konfigurerade redigeraren och skicka ändringarna till " "servern." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Redigering av kataloger stöds inte" -#: ../../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 "Redigeringen misslyckades" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Redigerar sökresultat" @@ -3379,7 +3385,7 @@ msgid "Email:" msgstr "E-postadress:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Tomt kommando" @@ -3387,7 +3393,7 @@ msgid "Empty command." msgstr "Tomt kommando." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Listning av tomma kataloger" @@ -3433,7 +3439,7 @@ msgid "Encryption details" msgstr "Krypteringsinformation" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Avsluta jämförelsen och ändra sorteringsordning?" @@ -3441,15 +3447,15 @@ msgid "Enter &custom command..." msgstr "Ange an&passat kommando..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Ange 0 för obegränsad hastighet." -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Ange kommando" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Ange anpassat kommando" @@ -3463,11 +3469,11 @@ msgid "Enter filter name" msgstr "Ange filternamn" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Ange namn för filteruppsättning" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Ange ett nytt namn för filteruppsättningen" @@ -3508,7 +3514,7 @@ "- ftps:// för FTP över TLS (implicit)\n" "- ftpes:// för FTP över TLS (explicit)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3538,7 +3544,7 @@ msgid "Error importing" msgstr "Importfel" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Fel vid inläsning av kön" @@ -3547,50 +3553,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/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: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:939 msgid "Error loading xml file" msgstr "Fel vid inläsning av XML-fil" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Fel vid sparande av kön" -#: ../../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 "Fel vid start av programmet" #: ../../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: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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Fel vid skrivning av XML-fil" -#: ../../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 "Fel:" @@ -3651,7 +3657,7 @@ #: ../../locales/../src/interface/quickconnectbar.cpp:66 #: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" -msgstr "FTP-motorn är inte initialiserad, kan inte ansluta" +msgstr "FTP-motorn är inte initierad, kan inte ansluta" #: ../../locales/../src/interface/resources/xrc/settings.xrc:232 msgid "FTP Keep-alive" @@ -3682,24 +3688,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP över implicit 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/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 "Misslyckades med att byta katalog" -#: ../../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 "Misslyckades med att byta språk" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Misslyckades med att kopiera eller flytta platserna" @@ -3707,130 +3713,134 @@ 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:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Misslyckades med att skapa ett lyssningssockel, avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "Misslyckades med att erhålla sökvägen till \"Mina dokument\"" -#: ../../locales/../src/interface/LocalTreeView.cpp:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Misslyckades med att erhålla sökvägen till Skrivbordet" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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:80 +#: ../../locales/../src/interface/context_control.cpp:82 msgid "Failed to initialize FTP engine" msgstr "Misslyckades med att initiera FTP-motorn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Misslyckades med att initiera TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Misslyckades med att initiera nätverket" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Misslyckades med att läsa in paneler, ogiltiga resursfiler?" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, 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:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Misslyckades med att öppna \"%s\" för skrivning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "Misslyckades med att öppna \"%s\" för läsning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "Misslyckades med att öppna \"%s\" för skrivning" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Misslyckades med att tolka returnerad sökväg." -#: ../../locales/../src/interface/netconfwizard.cpp:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Misslyckades med att ta emot data" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Misslyckades med att hämta kataloglistning" -#: ../../locales/../src/interface/netconfwizard.cpp:730 +#: ../../locales/../src/interface/netconfwizard.cpp:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Misslyckades med att hämta extern ip-adress, avbryter" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 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:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Misslyckades med att läsa av lokal ip-adress." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../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:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Misslyckades med att läsa av den externa IP-adressen." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Misslyckades med att skicka kommandot." -#: ../../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 "" "Misslyckades med att ställa in språket till %s (%s), använder systemets " "standardspråk" -#: ../../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 "" "Misslyckades med att ställa in språket till %s (%s), använder systemets " -"standardspråk (%s, %s)" +"standardspråk (%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 "" "Misslyckades med att ställa in språket till %s (%s), använder systemets " "standardspråk." -#: ../../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" @@ -3838,14 +3848,14 @@ "Misslyckades med att ställa in språket till %s, använder systemets " "standardspråk" -#: ../../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 "" "Misslyckades med att ställa in språket till %s, använder systemets " "standardspråk (%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 "" @@ -3856,11 +3866,11 @@ msgid "Failed to validate settings" msgstr "Misslyckades med att validera inställningarna" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Misslyckades med att verifiera andra partens certifikat" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Misslyckades med att skriva till filen %s" @@ -3893,19 +3903,19 @@ msgid "File Types" msgstr "Filtyper" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Filbeskrivaren är ingen sockel" #: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." -msgstr "Filen innehåller inga data att importera" +msgstr "Filen innehåller ingen importerbar data." #: ../../locales/../src/interface/settings/settingsdialog.cpp:108 msgid "File editing" msgstr "Filredigering" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Filen finns" @@ -3922,8 +3932,8 @@ msgstr "Fillistor" #: ../../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 "Filen hittades inte" @@ -3932,38 +3942,38 @@ msgid "File search" msgstr "Filsökning" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Filöverföringen avbröts av användaren" -#: ../../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 "Filöverföringen avbröts av användaren efter att ha överfört %s på %s" -#: ../../locales/../src/engine/ControlSocket.cpp:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Filöverföringen misslyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Filöverföringen hoppades över" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Filöverföringen lyckades" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Filöverföringar pågår fortfarande." @@ -3975,7 +3985,7 @@ msgid "File would transfer with binary data type." msgstr "Filen skulle gå att överföra som binär data." -#: ../../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" @@ -3989,11 +3999,11 @@ "FileZilla kan nu testa din konfiguration för att säkerställa att allt är " "korrekt konfigurerat." -#: ../../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 är redan anslutet till en server." -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -4007,7 +4017,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 @@ -4018,13 +4028,13 @@ msgid "Filename &filters..." msgstr "Filnamns&filter..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "Filnamnet kan inte skapas för katalogen %s och filnamnet %s" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Filnamnet är ogiltigt" @@ -4053,7 +4063,7 @@ msgstr "Filer som för närvarande redigeras" #: ../../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" @@ -4063,7 +4073,7 @@ msgid "Filesize format" msgstr "Format för filstorlek" -#: ../../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" @@ -4101,8 +4111,8 @@ 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: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 "Filteruppsättningen finns redan" @@ -4116,11 +4126,11 @@ msgid "Filter validation failed" msgstr "Filtervalideringen misslyckades" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Hitta &filer" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Hitta &kataloger" @@ -4137,7 +4147,7 @@ msgid "Fingerprint:" msgstr "Fingeravtryck:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Konfigurationsguide för brandvägg och router" @@ -4170,7 +4180,7 @@ msgid "Force showing &hidden files" msgstr "Tvinga visning av &dolda filer" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Tvinga visning av dolda filer" @@ -4185,12 +4195,12 @@ "citationstecken." #. @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 "Hittade ny %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Vidare dokumentation" @@ -4198,7 +4208,7 @@ msgid "General" msgstr "Allmänt" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Allmänt SOCKS-serverfel" @@ -4211,12 +4221,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Få hjälp" -#: ../../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 "" "Angivet namn för filteruppsättning finns redan. Skriv över filteruppsättning?" @@ -4225,22 +4235,22 @@ msgid "Global bookmarks" msgstr "Globala bokmärken" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS-fel %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS-fel %d i %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS-fel %d i %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS-fel %d: %s" @@ -4270,17 +4280,17 @@ msgstr "Dold" #: ../../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 "Hög" -#: ../../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 "Högst" -#: ../../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ögsta tillgängliga porten måste vara ett tal mellan 1024 och 65535." @@ -4295,7 +4305,7 @@ msgid "Homepage:" msgstr "Webbsida:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Värden ligger nere" @@ -4311,7 +4321,7 @@ 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:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Värden är inte tillgänglig" @@ -4330,7 +4340,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "IS&O 8601 (exempel: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "IPv6-adresser stöds inte vid användning av SOCKS4-proxy" @@ -4377,7 +4387,7 @@ msgstr "" "Om bytet av värdnyckel inte var väntat bör du kontakta serveradministratören." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4385,7 +4395,7 @@ "Om problemet kvarstår, är det någon router och/eller brandvägg som hindrar " "FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4403,7 +4413,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: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." @@ -4411,7 +4421,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4419,7 +4429,7 @@ "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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 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." @@ -4455,7 +4465,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:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Om du stänger FileZilla kommer du att förlora dina ändringar." @@ -4477,7 +4487,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:584 +#: ../../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 " @@ -4512,7 +4522,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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4573,7 +4583,7 @@ "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:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4581,7 +4591,7 @@ "Ofullständig kedja, toppcertifikatet är inget självsignerat certifikat från " "en certifikatsutfärdare" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Fel lösenord" @@ -4593,17 +4603,21 @@ "Information om senaste versionen av FileZilla kunde inte hämtas. Försök igen " "senare." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Initierar TLS..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Osäker algoritm!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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/interface/manual_transfer.cpp:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Interaktiv" @@ -4611,29 +4625,29 @@ msgid "Interface" msgstr "Gränssnitt" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Avbruten av signal" -#: ../../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 "Avbröts av användaren" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Ogiltig Content-Length" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Ogiltigt HTTP-svar" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Ogiltigt argument gavs" -#: ../../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." @@ -4641,18 +4655,19 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Ogiltig chunk-storlek" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Ogiltigt data togs emot" -#: ../../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 "Ogiltigt datum" @@ -4691,38 +4706,38 @@ "ftps:// för FTP över TLS (implicit) och\n" "ftpes:// för FTP över TLS (explicit)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." msgstr "Ogiltigt reguljärt uttryck i sökvillkoren." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Ogiltig svarskod" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" msgstr "Ogiltiga sökvillkor: %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 "Ogiltig sökväg för platsen" @@ -4734,23 +4749,23 @@ msgid "Invalid username given." msgstr "Ogiltigt användarnamn angivet." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Felaktigt värde för ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Ogiltigt värde för tips" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Rättskipningsland:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Rättskipningsplats:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Rättskipningsstat eller provins:" @@ -4758,7 +4773,7 @@ msgid "Keep directories on top" msgstr "Lista kataloger överst" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4793,11 +4808,11 @@ msgid "Language" msgstr "Språk" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Språket har ändrats" -#: ../../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" @@ -4827,7 +4842,7 @@ msgid "Limit:" msgstr "Gräns:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Radlängd överstigen" @@ -4835,13 +4850,14 @@ msgid "Linked against" msgstr "Länkad mot" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Lyssningssockel stängd" -#: ../../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 "Listning:" @@ -4854,11 +4870,11 @@ msgid "Local" msgstr "Lokal" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Lokal adress används" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Lokal ändpunkt har stängts" @@ -4866,21 +4882,21 @@ msgid "Local file" msgstr "Lokal fil" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Den lokala filen finns inte." -#: ../../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 "Lokal fil är %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 "Den lokala filen är en katalog istället för en vanlig fil." -#: ../../locales/../src/interface/manual_transfer.cpp:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Den lokala filen har inget giltigt filnamn." @@ -4892,7 +4908,7 @@ msgid "Local site:" msgstr "Lokal plats:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Plats:" @@ -4900,12 +4916,16 @@ msgid "Log file" msgstr "Loggfil" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Inloggad" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Loggning" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4914,7 +4934,7 @@ "servern kan hantera UTF-8. Kan inte falla tillbaka på lokal " "teckenuppsättning eftersom proxy används." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4922,7 +4942,7 @@ "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:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Inloggningssekvensen fullständigt utförd, ändå inte inloggad. Avbryter." @@ -4942,17 +4962,17 @@ "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:899 -#: ../../locales/../src/interface/queue.cpp:986 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Låg" -#: ../../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 "Lägst" -#: ../../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 "Lägsta tillgängliga port måste vara ett tal mellan 1024 och 65535." @@ -4966,44 +4986,44 @@ "Försäkra dig om att filen är åtkomlig och att den är ett välformat XML-" "dokument." -#: ../../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 "Felaktig chunk-data: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Felaktigt huvud: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:549 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: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 "Manuell överföring" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" msgstr "Matcha alla av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" msgstr "Matcha något av följande" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Matcha inget av följande" @@ -5011,12 +5031,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Maximalt antal samtidiga ö&verföringar:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Minnesallokeringsfel" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Meddelandelogg" @@ -5024,7 +5044,7 @@ msgid "Message log position" msgstr "Placering av meddelandeloggen" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Meddelandet är för stort" @@ -5044,15 +5064,15 @@ msgid "Move &up" msgstr "Flytta &upp" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Den här Datorn" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Mina Dokument" -#: ../../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" @@ -5073,7 +5093,7 @@ msgstr "Namnet finns redan" #: ../../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 "Ett bokmärke med det namnet finns redan." @@ -5089,7 +5109,7 @@ msgid "Need to enter filter name" msgstr "Du måste ange ett filternamn" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Du måste ange en giltig fjärrsökväg" @@ -5097,18 +5117,18 @@ msgid "Need to specify a character encoding" msgstr "Du måste ange en teckenkodning" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Varken nodnamn eller servname tillhandahållet, eller okända" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Nätverket är inte tillgängligt" @@ -5124,7 +5144,7 @@ msgid "New &tab" msgstr "Ny &flik" -#: ../../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 "Nytt Bok&märke" @@ -5143,14 +5163,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 "Nytt bokmärke" -#: ../../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 "Ny katalog" @@ -5167,9 +5187,9 @@ msgid "New folder" msgstr "Ny katalog" -#: ../../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 "Ny plats" @@ -5177,11 +5197,11 @@ msgid "Next to the transfer queue" msgstr "Bredvid överföringskön" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Nej" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Ingen adress är associerad med nodnamnet" @@ -5189,11 +5209,11 @@ msgid "No category to export selected" msgstr "Ingen kategori att exportera" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Inget kommando gavs, avbryter." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Ingen extern IP-adress inställd, provar standard." @@ -5215,26 +5235,26 @@ msgid "No images available" msgstr "Inga bilder tillgängliga" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../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: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 "Inget namn för filteruppsättning angivet." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Inget program är associerat med filtypen" -#: ../../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 "" "Inget program har associerats för att redigera filer med ändelsen \"%s\"." -#: ../../locales/../src/engine/socket.cpp:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Ingen väg till värden" @@ -5242,11 +5262,11 @@ msgid "No search results" msgstr "Inga sökresultat" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Inga platser tillgängliga" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Ingen autentiseringsmetod för SOCKS5 stöds" @@ -5256,7 +5276,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 "Ingen" @@ -5264,18 +5284,18 @@ msgid "None selected yet" msgstr "Ingenting markerat ännu" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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/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/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" @@ -5285,16 +5305,16 @@ 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:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Inte ansluten" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Inte ansluten till någon server" -#: ../../locales/../src/interface/Mainfrm.cpp:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Inte ansluten till någon server." @@ -5302,11 +5322,11 @@ msgid "Not connected." msgstr "Inte ansluten." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" -msgstr "Inte initialiserad, måste anropa WSAStartup" +msgstr "Inte initierad, måste anropa WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5350,13 +5370,13 @@ #: ../../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" @@ -5374,7 +5394,7 @@ "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:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "En gång" @@ -5420,8 +5440,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 "Öppnandet misslyckades" @@ -5444,19 +5464,19 @@ msgid "Operating System:" msgstr "Operativsystem:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Åtgärden pågår redan" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Åtgärden pågår" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Åtgärden stöds inte" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Organisation:" @@ -5464,16 +5484,16 @@ msgid "Other SFTP options" msgstr "Andra SFTP-alternativ" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Annat systemfel" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Övrigt:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Slut på minne" @@ -5521,7 +5541,7 @@ 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:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Egen byggtyp: %s\n" @@ -5548,7 +5568,7 @@ msgid "P&roxy host:" msgstr "Proxy&värd:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT-kommandot påverkat av en router eller brandvägg." @@ -5556,11 +5576,11 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&ssivt läge (rekommenderas)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parametern är ingen giltig URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Tolkar %d byte versionsinformation.\n" @@ -5580,13 +5600,13 @@ msgid "Passive mode" msgstr "Passivt läge" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "Passivt läge har ställts in som standardöverföringsläge." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Lösenord krävs" @@ -5595,13 +5615,13 @@ msgid "Path" msgstr "Sökväg" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Sökvägen kan inte skapas för katalogen %s och underkatalogen %s" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Sökvägen hittades inte:" @@ -5620,8 +5640,8 @@ msgid "Permission" msgstr "Rättighet" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Åtkomst nekad" @@ -5634,7 +5654,7 @@ msgid "Platform:" msgstr "Plattform:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5650,12 +5670,12 @@ "Konfigurera eventuella brandväggar och routrar så att FileZilla kan etablera " "utgående anslutningar till godtyckliga portar." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5690,7 +5710,7 @@ 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:389 +#: ../../locales/../src/interface/filter.cpp:390 #, c-format msgid "Please enter a new name for the filter set \"%s\"" msgstr "Ange ett nytt namn för filteruppsättningen \"%s\"" @@ -5720,7 +5740,7 @@ msgid "Please enter a password for this server:" msgstr "Ange ett lösenord för denna server:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5737,7 +5757,7 @@ "Ange en tidsgräns mellan 10 och 9999 sekunder eller 0 för att inaktivera " "tidsgränser." -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Ange ett unikt namn för den här filteruppsättningen" @@ -5745,11 +5765,11 @@ msgid "Please enter a username for this server:" msgstr "Ange ett användarnamn för den här servern:" -#: ../../locales/../src/interface/netconfwizard.cpp:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Ange ett giltigt portintervall." -#: ../../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 "Ange en URL från vilken man kan läsa av din externa IP-adress" @@ -5759,7 +5779,7 @@ 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:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5767,14 +5787,14 @@ "Ange ett rått FTP-kommando.\n" "Användandet av råa FTP-kommandon kommer att tömma katalogcachen." -#: ../../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 "Please enter the name of the directory which should be created:" msgstr "Ange namnet på katalogen som skall skapas:" -#: ../../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 "Ange namnet på filen som skall skapas:" @@ -5782,12 +5802,12 @@ 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:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Ange din externa IP-adress" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5805,7 +5825,7 @@ "Följ instruktionerna noga då en felaktig konfiguration kommer att förhindra " "lyckade FTP-ansluningar." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5813,12 +5833,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:136 +#: ../../locales/../src/interface/FileZilla.cpp:157 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:609 +#: ../../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 " @@ -5842,7 +5862,7 @@ "andra skadliga program. Det här kan ge upphov till ett falsklarm som du " "tryggt kan ignorera." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5858,7 +5878,7 @@ "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:585 +#: ../../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 " @@ -5867,7 +5887,7 @@ "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:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Välj en åtgärd:" @@ -5902,7 +5922,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:596 +#: ../../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. " @@ -5915,14 +5935,14 @@ "konfigurerad. Du måste manuellt ställa in \"port forwarding\". Kom ihåg att " "inte köra din router i ett så kallat \"DMZ mode\" eller \"Game mode\". " "Sådant som protokollinspektion eller protokollspecifika \"fixar\" måste vara " -"inaktiverade." +"inaktiverat" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "&Placering av meddelandeloggen:" -#: ../../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 "Postnummer:" @@ -5934,12 +5954,12 @@ msgid "Preallocation" msgstr "Förallokering" -#: ../../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 "Fördefinierade platser" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Bevarar tidsstämplar för filer" @@ -5947,7 +5967,7 @@ msgid "Preview:" msgstr "Förhandsgranska:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "" "Certifikateten för primär anslutning och dataanslutning stämmer inte överens." @@ -5964,7 +5984,7 @@ msgid "Prioritize directories (default)" msgstr "Prioritera kataloger (standard)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Prioritet" @@ -5994,7 +6014,7 @@ msgid "Process &Queue" msgstr "Behandla &kön" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Överflöde i processfiltabellen" @@ -6004,11 +6024,11 @@ msgid "Processed %s in %s." msgstr "Behandlade %s i %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Protokollet stöds inte" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Protokollet stöds inte på angiven sockeltyp" @@ -6025,37 +6045,41 @@ msgid "Proxy &user:" msgstr "Proxya&nvändare:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Proxyns autentisering misslyckades" -#: ../../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 "Proxyhandskakningen misslyckades: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Proxysvar: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" msgstr "Proxyns begäran misslyckades: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Proxyn är inställd men proxyns värd eller port är ogiltig" @@ -6071,7 +6095,7 @@ msgid "Public permissions" msgstr "Publika rättigheter" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Hela kön har behandlats" @@ -6090,11 +6114,11 @@ msgid "Queue: empty" msgstr "Kö: tom" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Filer i kö" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Köar:" @@ -6111,7 +6135,7 @@ 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:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Rått FTP-kommando" @@ -6128,7 +6152,7 @@ msgid "Re&name" msgstr "&Byt namn" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6144,12 +6168,12 @@ msgid "Read-only" msgstr "Skrivskyddad" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Vill du verkligen avbryta aktuell åtgärd?" -#: ../../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 "" @@ -6159,37 +6183,37 @@ msgstr[1] "" "Vill du verkligen ta bort %d kataloger och deras innehåll från servern?" -#: ../../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] "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: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 "Vill du verkligen ta bort %s och %s från servern?" -#: ../../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 "" "Vill du verkligen ta bort alla markerade filer och/eller kataloger från " "servern?" -#: ../../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 "" "Vill du verkligen ta bort alla markerade filer och/eller kataloger från din " "dator?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Orsak" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Starta om nu" @@ -6197,36 +6221,36 @@ msgid "Rec&urse into subdirectories" msgstr "&Upprepa i underkataloger" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, 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:2965 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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: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 "Mottog en rad som överskred 10000 tecken, avbryter." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Mottagen data är påverkad" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Mottog felaktigt tecken i versionsinformationen" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Mottagen versionsinformation är för stor" @@ -6259,13 +6283,13 @@ msgid "Recursively deleting files and directories." msgstr "Tar bort filer och kataloger rekursivt." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Omdirigering till ogiltig adress eller adress som inte stöds: %s" @@ -6275,7 +6299,7 @@ msgid "Refresh the file and folder lists" msgstr "Uppdatera fil- och kataloglistor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Komma ihåg lösenord?" @@ -6283,20 +6307,20 @@ msgid "Remote" msgstr "Fjärran" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Fjärrcertifikatet inte pålitligt." #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Fjärrfil" -#: ../../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 "Fjärrfilsökning" @@ -6334,11 +6358,11 @@ "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:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Fjärrsökvägen kunde inte tolkas." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Hantering av fjärrsökväg:" @@ -6378,29 +6402,29 @@ msgid "Rename selected files and directories" msgstr "Byt namn på markerade filer och kataloger" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Byter namn på \"%s\" till \"%s\"" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Rapportera fel och efterfråga funktioner" -#: ../../locales/../src/engine/proxy.cpp:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Begäran vägrades eller misslyckades" @@ -6416,28 +6440,28 @@ msgid "Reset and requeue &all" msgstr "&Återställ och lägg alla filer i kö på nytt" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Uppslaget protokoll är okänt" -#: ../../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 "Slår upp adressen för %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Resursen är tillfälligt otillgänglig" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Svar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Resultat:" @@ -6456,19 +6480,19 @@ "Återupptagning av ASCII-filer kan skapa problem om servern använder ett " "annat radslutsformat än klienten." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Hämtar kataloglistning för \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Hämtar kataloglistning..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Hämtar extern IP-adress från %s" @@ -6485,7 +6509,7 @@ msgid "S&hutdown system" msgstr "S&täng av systemet" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "S&toppa" @@ -6505,7 +6529,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4-proxyn kommer ansluta till: %s" @@ -6514,39 +6538,39 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Spara inställningarna?" -#: ../../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 "Sparande av lösenord har inaktiverats av din systemadministratör." -#: ../../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 "Sparande av lösenord har inaktiverats av dig." -#: ../../locales/../src/interface/QueueView.cpp:1710 +#: ../../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:1712 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" msgstr "Söker efter filer att skicka" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Sök&villkor:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Sök i &katalogen:" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." -msgstr "Sök rekursivt efter filer" +msgstr "Sök rekursivt efter filer." #: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" @@ -6556,8 +6580,8 @@ msgid "Security information" msgstr "Säkerhetsinformation" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Se även: https://wiki.filezilla-project.org/Network_Configuration" @@ -6609,7 +6633,7 @@ msgstr "Välj fil för exporterad data" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Välj fil för exporterad kö" @@ -6618,7 +6642,7 @@ msgstr "Välj fil för exporterade inställningar" #: ../../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 "Välj fil för exporterade platser" @@ -6626,23 +6650,23 @@ msgid "Select file to import settings from" msgstr "Välj fil att importera inställningar från" -#: ../../locales/../src/interface/manual_transfer.cpp:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Välj fil att skicka" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" msgstr "Välj filnamn för den konverterade nyckelfilen" -#: ../../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 "Välj hur dessa filer skall öppnas." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Välj katalog att hämta till" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Välj målfilens namn" @@ -6654,7 +6678,7 @@ 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: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." @@ -6668,7 +6692,7 @@ msgstr[0] "%d katalog markerad." msgstr[1] "%d kataloger markerade." -#: ../../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." @@ -6689,7 +6713,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "%s och %s är markerade för överföring." @@ -6727,7 +6751,7 @@ msgid "Selected file is still being edited" msgstr "Vald fil redigeras fortfarande" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Selected filter only works for local files." msgstr "Det valda filtret fungerar bara för lokala filer." @@ -6752,12 +6776,12 @@ 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:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Skickar keep-alive kommando" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Serienummer:" @@ -6765,21 +6789,21 @@ msgid "Server &Type:" msgstr "Server&typ:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 msgid "Server did not properly shut down TLS connection" msgstr "Servern stängde inte ner TLS-anslutningen korrekt" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Servern stöder inte icke-ASCII-tecken." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6788,15 +6812,15 @@ "Servern stöder inte återupptagande av filer > %d GB. Avsluta överföringen " "eftersom filerna är lika stora." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Servern stöder inte återupptagande av filer > 2 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Servern stöder inte återupptagande av filer > 4 GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6805,18 +6829,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:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 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:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Servern returnerade en tom sökväg." -#: ../../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." @@ -6824,13 +6848,13 @@ "Servern skickade en extra inloggningsuppmaning. Du måste använda den " "interaktiva inloggningstypen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6839,14 +6863,14 @@ "Använder serveradressen istället." #: ../../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: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 "Servern skickade ett oväntat svar." @@ -6862,7 +6886,7 @@ msgid "Server&type:" msgstr "Server&typ:" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Server/Lokal fil" @@ -6879,13 +6903,13 @@ msgid "Set &Priority" msgstr "Ställ in &prioritet" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, 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:789 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "SetSocketBufferSize anropades utan sockel" @@ -6905,7 +6929,7 @@ msgid "Show &welcome dialog..." msgstr "Visa &välkomstdialogruta..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Visa båda katalogträden och fortsätta med jämförelsen?" @@ -6925,7 +6949,7 @@ msgid "Shows this help dialog" msgstr "Visar denna hjälpdialogruta" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Stäng av nu" @@ -6965,23 +6989,23 @@ msgid "Site Manager already open" msgstr "Platshanteraren är redan öppen" -#: ../../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 "Platsen finns inte." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 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: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 "Platssökvägen är felaktig." @@ -6999,7 +7023,7 @@ "Platsspecifika bokmärken kräver att servern lagras i Platshanteraren.\n" "Lägga till nuvarande anslutning i Platshanteraren?" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Storlek" @@ -7018,43 +7042,43 @@ msgid "Skip file" msgstr "Hoppa över filen" -#: ../../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 "Hoppar över hämtningen av %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 "Hoppar över sändningen av %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Sockeladressen är utanför adressrymden" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Sockeln är redan ansluten" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Sockeln har stängts ner" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Sockeln är inte ansluten" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Sockeltypen stöds inte för adressfamiljen" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Några filer redigeras fortfarande eller behöver skickas." @@ -7071,7 +7095,7 @@ msgid "Sort directories inline" msgstr "Sortera kataloger som filer" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Sorteringsordningen kan inte ändras när kataloger jämförs." @@ -7085,9 +7109,9 @@ #: ../../locales/../src/interface/RemoteTreeView.cpp:102 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." +msgstr "Källa och sökväg för släppåtgärden är identiska" -#: ../../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 "Källfilen och målfilen får inte vara identiska" @@ -7099,7 +7123,7 @@ msgid "Source file:" msgstr "Källfil:" -#: ../../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" @@ -7137,19 +7161,19 @@ msgid "Start with opened Site Manager" msgstr "Starta med Platshanteraren öppen" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, c-format msgid "Started update check on %s\n" msgstr "Kontroll av uppdateringar startade %s\n" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Påbörjar hämtning av %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Påbörjar sändning av %s" @@ -7158,18 +7182,18 @@ msgid "Starts the local site in the given path" msgstr "Startar lokal plats vid angiven sökväg" -#: ../../locales/../src/interface/verifycertdialog.cpp:221 +#: ../../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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 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:110 +#: ../../locales/../src/interface/StatusView.cpp:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Status:" @@ -7181,7 +7205,7 @@ msgid "Stop recursive operation" msgstr "Stoppa den rekursiva åtgärden" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Gata:" @@ -7197,11 +7221,11 @@ msgid "Summary of test results:" msgstr "Sammanfattning av testresultatet:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Försätt i vänteläge nu" -#: ../../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." @@ -7209,24 +7233,24 @@ "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: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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Synkroniserad bläddring" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Synkroniserad bläddring har inaktiverats." @@ -7240,8 +7264,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Syntaxfel i kommandoraden" @@ -7253,11 +7277,11 @@ msgid "System details" msgstr "Systemdetaljer" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Systemets gräns för antal öppna filer har överskridits" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Systemets underliggande nätverkssystem har fallerat" @@ -7265,19 +7289,19 @@ msgid "T&oolbar" msgstr "&Verktygsfält" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS-anslutningen är etablerad, skickar HTTP-begäran" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS-anslutning etablerad, väntar på välkomstmeddelande..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS-anslutning etablerad." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL har förfallit" @@ -7289,15 +7313,15 @@ msgid "Target file:" msgstr "Målfil:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Målfilnamnet finns redan!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Målfilnamnet finns redan, vill du verkligen fortsätta?" -#: ../../locales/../src/engine/socket.cpp:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Tillfälligt fel vid namnuppslagningen" @@ -7305,7 +7329,7 @@ msgid "Test results" msgstr "Testresultat" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Testar om servern klarar av att återuppta överföringar" @@ -7330,25 +7354,25 @@ "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:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Adressen som du angav var: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "ai_family-medlemmen stöds inte" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Bokmärket kunde inte läggas till." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Bokmärkerna kunde inte tömmas." @@ -7374,17 +7398,17 @@ "Det anpassade tidsformatet är ogiltigt eller innehåller det " "formatspecifikationer som inte stöds." -#: ../../locales/../src/engine/transfersocket.cpp:139 +#: ../../locales/../src/engine/transfersocket.cpp:141 #, c-format msgid "The data connection could not be established: %s" msgstr "Dataanslutningen kunde inte etableras: %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 "Standardredigeraren för textfiler kunde inte hittas." -#: ../../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 "Standardredigeraren för textfiler är \"%s\"." @@ -7395,7 +7419,7 @@ msgid "The entered filter name already exists, please choose a different name." msgstr "Det angivna filternamnet finns redan, välj ett annat 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 "Filändelsen \"%s\" finns redan i listan" @@ -7411,7 +7435,7 @@ "Ange ett nytt namn:" #: ../../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" @@ -7444,7 +7468,7 @@ msgstr "Filen \"%s\" kunde inte läsas in." #: ../../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" @@ -7454,7 +7478,7 @@ "I ditt system är inget program associerat med den här filtypen." #: ../../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" @@ -7475,7 +7499,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:105 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:104 #, c-format msgid "" "The file '%s' is not in a format supported by FileZilla.\n" @@ -7524,7 +7548,7 @@ msgid "The following files are currently being edited:" msgstr "Följande filer redigeras för närvarande:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Den fria öppenkällkodslösningen för FTP" @@ -7546,17 +7570,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Den lokala katalogen \"%s\" kunde inte skapas." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." msgstr "Den lokala katalogen \"%s\" finns inte." -#: ../../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" @@ -7565,7 +7589,7 @@ "Den lokala katalogen \"%s\" ligger inte under synkroniseringsroten (%s).\n" "Inaktivera synkroniserad bläddring och fortsätta byta den lokala katalogen?" -#: ../../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." @@ -7581,16 +7605,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Kön kommer inte att sparas." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Fjärrkatalogen \"%s\" finns inte." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7629,11 +7653,11 @@ "Detta kan vara farligt och skulle kunna skada ditt sytem.\n" "Vill du verkligen fortsätta?" -#: ../../locales/../src/interface/sitemanager.cpp:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Servern kunde inte läggas till." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Servern skickade ett oväntat eller okänt svar." @@ -7668,7 +7692,7 @@ "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:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Parametern servname stöds inte för ai_socktype" @@ -7680,19 +7704,19 @@ "Inställningarna har importerats. Du måste starta om FileZilla för att " "inställningarna skall gälla." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Den angivna familjen av adresser stöds inte" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Angivet nätverksnamn är inte längre tillgängligt" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 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." @@ -7704,7 +7728,7 @@ "Målfilen finns redan.\n" "Välj en åtgärd." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Testet misslyckades. Vill du verkligen spara inställningarna?" @@ -7717,15 +7741,15 @@ msgid "Themes" msgstr "Teman" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Den här filteruppsättningen kan inte tas bort." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Den här filteruppsättningens namn kan inte bytas." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7749,7 +7773,7 @@ "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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Tid" @@ -7762,25 +7786,25 @@ msgstr "Tids&gräns i sekunder:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Tidsgräns" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "Serverns tidszonsskillnad är %d sekunder." -#: ../../locales/../src/interface/verifycertdialog.cpp:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Titel:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -7844,17 +7868,17 @@ msgid "Toggles the display of the transfer queue" msgstr "Visa/dölj överföringskön" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "För lång huvudrad" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "För många omdirigeringar" -#: ../../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 "Spårning:" @@ -7883,17 +7907,17 @@ msgid "Transfer Settings" msgstr "Överföringsinställningar" -#: ../../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 "Överföringens anslutning avbröts: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Överförd data blev påverkad." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Överför" @@ -7902,8 +7926,7 @@ msgid "Transfers" msgstr "Överföringar" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Slutförda överföringar" @@ -7915,11 +7938,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Behandla &följande filtyper som ASCII-filer:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Lita på ändrad värdnyckel:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Lita på ny värdnyckel:" @@ -7957,7 +7980,7 @@ msgid "U&pload" msgstr "S&kicka" -#: ../../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 "Gräns för sä&ndning:" @@ -7967,20 +7990,20 @@ msgstr "An&vänd filtypsassociationer om tillgängligt" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Använd s&ystemstandard" +msgid "U&se system defaults for current language" +msgstr "A&nvänd systemets standardinställningar för aktuellt språk" #: ../../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:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Okänd felkod %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Avdelning:" @@ -7989,11 +8012,11 @@ msgid "Unknown" msgstr "Okänd" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Okänd protokollversion av SOCKS: %d" @@ -8006,7 +8029,7 @@ msgid "Unknown host key" msgstr "Okänd värdnyckel" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8020,8 +8043,8 @@ "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:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8029,7 +8052,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:598 +#: ../../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." @@ -8037,11 +8060,11 @@ "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:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Certifikatstypen stöds inte" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Omdirigeringen stöds inte" @@ -8111,12 +8134,12 @@ msgid "Use &custom editor:" msgstr "Använd an&passad redigerare:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Använd &synkroniserad bläddring" @@ -8143,8 +8166,8 @@ msgstr "Använd servern från Platshanteraren" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Använd &systemstandard" +msgid "Use system &defaults for current language" +msgstr "Använd systemets &standardinställningar för aktuellt språk" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8180,7 +8203,7 @@ msgid "User:" msgstr "Användare:" -#: ../../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 "Användarnamnet får inte bestå av en följd av blanksteg" @@ -8204,7 +8227,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Utförliga loggmeddelanden från vxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Validerar certifikatet..." @@ -8212,7 +8235,7 @@ msgid "Very high" msgstr "Mycket hög" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 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" @@ -8229,15 +8252,15 @@ msgid "W&rite" msgstr "S&kriv" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Väntar" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Väntar på anslutning för att bläddra" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Väntar på lösenord" @@ -8249,7 +8272,7 @@ msgid "Waiting to retry..." msgstr "Väntar på att försöka igen..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Varning, ignorerar dataanslutning från felaktig IP-adress." @@ -8272,11 +8295,11 @@ msgid "Warning: Potential security breach!" msgstr "Varning: Möjlig säkerhetsöverträdelse!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Välkommen till FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Vad är nytt" @@ -8284,7 +8307,7 @@ msgid "What's new:" msgstr "Vad är nytt:" -#: ../../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." @@ -8308,7 +8331,7 @@ msgid "Widescreen" msgstr "Bredbild" -#: ../../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 "Vill du att FileZilla skall komma ihåg lösenord?" @@ -8316,20 +8339,20 @@ msgid "Wr&ite" msgstr "Sk&riv" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Felaktig extern IP-adress" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Felaktiga radslut" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Ja" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8341,7 +8364,7 @@ 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:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 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." @@ -8380,19 +8403,19 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../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 markerat fler än 10 filer för redigering, vill du verkligen fortsätta?" -#: ../../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?" @@ -8400,7 +8423,7 @@ "Du har markerat fler än 10 filer eller kataloger att öppna, vill du " "verkligen fortsätta?" -#: ../../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 "Du måste ange ett värdnamn." @@ -8409,30 +8432,30 @@ 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:518 +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Du måste ange en lokal katalog." -#: ../../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 "Du måste ange en giltig IP-adress." +#: ../../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 måste ange en giltig IPv4-adress." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 msgid "You have to enter a writable local directory." msgstr "Du måste ange en skrivbar lokal katalog." -#: ../../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 "Du måste ange ett kontonamn" -#: ../../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 "Du måste ange ett användarnamn" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8485,23 +8508,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:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Du måste ange en lokal fil." -#: ../../locales/../src/interface/manual_transfer.cpp:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Du måste ange en fjärrfil." -#: ../../locales/../src/interface/manual_transfer.cpp:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Du måste ange en fjärrsökväg." -#: ../../locales/../src/interface/manual_transfer.cpp:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Du måste ange en server." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8509,7 +8532,7 @@ "Du borde inte ha några problem med att ansluta till andra servrar, " "filöverföringar borde fungera korrekt." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 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." @@ -8534,7 +8557,7 @@ msgid "contains" msgstr "innehåller" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "anpassad" @@ -8556,19 +8579,19 @@ msgid "equals" msgstr "är lika med" -#: ../../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: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: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 " @@ -8578,15 +8601,15 @@ "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:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp hör till en annan version av FileZilla" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp kunde inte startas" -#: ../../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 returnerade inga certifikat" @@ -8642,10 +8665,10 @@ msgid "owner writeable" msgstr "skrivbar för ägaren" -#: ../../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: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 "okänd" @@ -8666,6 +8689,30 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Empty dirs to visit" +#~ msgstr "Tomma kataloger att besöka" + +#~ 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" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Hämtning av flera orelaterade kataloger stöds ännu inte" + +#~ msgid "Downloading search results" +#~ msgstr "Hämtar sökresultat" + +#~ msgid "U&se system defaults" +#~ msgstr "Använd s&ystemstandard" + +#~ msgid "Use system &defaults" +#~ msgstr "Använd &systemstandard" + #~ msgid "" #~ "Any changes made in the Site Manager will not be saved unless you repair " #~ "the file." diff -Nru filezilla-3.14.1/locales/tr.po filezilla-3.15.0.2/locales/tr.po --- filezilla-3.14.1/locales/tr.po 2015-02-16 18:33:37.000000000 +0000 +++ filezilla-3.15.0.2/locales/tr.po 2016-02-10 19:27:09.000000000 +0000 @@ -3,17 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 2. Roman Neumüller , 2007 -# Kaya Zeren , 2014-2015 +# Roman Neumüller , 2007 +# Kaya Zeren , 2014-2016 # Volkan Gezer , 2013 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-02-08 08:56+0000\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-31 09:02+0000\n" "Last-Translator: Kaya Zeren \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/kayazeren/" "filezilla/language/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" @@ -42,50 +42,50 @@ "%a - Hesap (Hesap giriş tipi kullanılmıyorsa bunu içeren satırlar dikkate " "alınmaz)" -#: ../../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 klasör" -#: ../../locales/../src/interface/RemoteListView.cpp:1417 -#: ../../locales/../src/interface/search.cpp:469 -#: ../../locales/../src/interface/search.cpp:780 +#: ../../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] "İçindekilerle %d klasör" -#: ../../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: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 dosya" -#: ../../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 dosya. Toplam boyut: %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 dosya. Toplam boyut: En az %s" -#: ../../locales/../src/interface/QueueView.cpp:2841 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -95,6 +95,18 @@ msgid "%h - Host" msgstr "%h - Sunucu" +#: ../../locales/../src/interface/recursive_operation_status.cpp:108 +#, c-format +msgid "%llu directory" +msgid_plural "%llu directories" +msgstr[0] "%llu klasör" + +#: ../../locales/../src/interface/recursive_operation_status.cpp:107 +#, c-format +msgid "%llu file" +msgid_plural "%llu files" +msgstr[0] "%llu dosya" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:517 #, c-format msgid "%p - Password" @@ -110,12 +122,12 @@ 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 - Sertifikanın süresi dolmuş!" -#: ../../locales/../src/interface/verifycertdialog.cpp:28 +#: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" msgstr "%s - Henüz doğrulanmamış!" @@ -125,23 +137,23 @@ msgid "%s - Proxy user" msgstr "%s - Vekil sunucu kullanıcı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 ve %s. Toplam boyut: %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 ve %s. Toplam boyut: En az %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 bayt" -#: ../../locales/../src/interface/FileZilla.cpp:674 +#: ../../locales/../src/interface/FileZilla.cpp:617 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -155,7 +167,7 @@ "FileZilla yazılımını yeniden indirip kurun. Sorun çözülmüyorsa bir hata " "raporu gönderin." -#: ../../locales/../src/interface/FileZilla.cpp:759 +#: ../../locales/../src/interface/FileZilla.cpp:702 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -171,7 +183,7 @@ "- %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." -#: ../../locales/../src/interface/verifycertdialog.cpp:57 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s ve %d bit" @@ -185,60 +197,60 @@ msgid "%w - Proxy password" msgstr "%w - Vekil sunucu parolası" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" -msgstr "Ö&nceki bağlantıyı iptal ederek geçerli sekmede bağlanın" +msgstr "Ö&nceki bağlantıyı iptal edip geçerli sekmede bağlan" #: ../../locales/../src/interface/resources/xrc/menus.xrc:233 msgid "&About..." msgstr "H&akkında..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 -#: ../../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 "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:399 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 msgid "&Active" msgstr "&Aktif" #: ../../locales/../src/interface/resources/xrc/menus.xrc:206 msgid "&Add bookmark..." -msgstr "Yer imi &ekleyin..." +msgstr "Yer imi &ekle..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:245 #: ../../locales/../src/interface/resources/xrc/menus.xrc:291 msgid "&Add files to queue" -msgstr "&Aktarım kuyruğuna ekleyin" +msgstr "&Aktarım kuyruğuna ekle" #: ../../locales/../src/interface/resources/xrc/settings.xrc:645 -msgid "&Add keyfile..." -msgstr "&Anahtar dosyası ekleyin..." +msgid "&Add key file..." +msgstr "&Anahtar Dosyası Ekle..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:488 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:547 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:492 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:551 msgid "&Add to queue" -msgstr "&Aktarım kuyruğuna ekleyin" +msgstr "&Aktarım kuyruğuna ekle" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:328 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:377 msgid "&Adjust server timezone offset:" msgstr "Sunucu s&aat dilimi farkı:" -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:237 +#: ../../locales/../src/interface/resources/xrc/certificate.xrc:242 msgid "&Always trust certificate in future sessions." msgstr "Sonr&aki oturumlarda bu sertifikaya güvenilsin." -#: ../../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 "Bu sunucuy&a güvenilerek anahtarı belleğe eklensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1939 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1958 msgid "&Always use default editor" msgstr "Her z&aman varsayılan düzenleyici kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "Bu seçim tüm ilişkilendirilmemiş dosy&alar için kullanılsın" @@ -251,22 +263,22 @@ msgstr "Dış IP &adresi işletim sistemine sorulsun" #: ../../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:586 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1054 msgid "&Auto" msgstr "Otom&atik" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:461 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:510 msgid "&Autodetect" msgstr "Otomatik &algılanan" #: ../../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:594 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1069 msgid "&Binary" msgstr "İk&ili" -#: ../../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 "SI sem&bollerini kullanan ikili önekler. (örnek: 1 KB = 1024 bytes)" @@ -274,25 +286,25 @@ msgid "&Bookmarks" msgstr "&Yer İmleri" -#: ../../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: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 "&Gözatın..." +msgstr "&Gözat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:936 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:955 msgid "&Burst tolerance:" msgstr "&Hoşgörü:" #: ../../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: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" @@ -300,63 +312,59 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:50 msgid "&Clear private data..." -msgstr "&Kişisel verileri silin..." +msgstr "&Kişisel verileri sil..." #: ../../locales/../src/interface/resources/xrc/update.xrc:28 msgid "&Close" -msgstr "&Kapatın" +msgstr "&Kapat" #: ../../locales/../src/interface/resources/xrc/menus.xrc:377 msgid "&Close FileZilla" msgstr "FileZilla &Kapansın" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:631 msgid "&Configure speed limits..." -msgstr "Hız &sınırlarını ayarlayın..." +msgstr "Hız &aınırı ayarları..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:163 msgid "&Configure..." -msgstr "A&yarlayın..." +msgstr "A&yarla..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:540 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:589 msgid "&Connect" -msgstr "&Bağlanın" +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 kopyalayın..." +msgstr "Geçerli bağlantıyı Site Yöneti&cisine kopyala..." -#: ../../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:428 msgid "&Copy to clipboard" -msgstr "Panoya &kopyalayın" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:437 -msgid "&Crash" -msgstr "Çö&küş" +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:494 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:498 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:562 msgid "&Create directory" -msgstr "&Klasör oluşturun" +msgstr "&Klasör oluştur" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:607 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 msgid "&Create new tab" -msgstr "&Sekme ekleyin" +msgstr "&Sekme ekle" #: ../../locales/../src/interface/menu_bar.cpp:72 msgid "&Debug" msgstr "&Hata Ayıklama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2234 msgid "&Debug information in message log:" -msgstr "İleti günlüğün&deki hata ayıklama bilgisi:" +msgstr "Hata ayıklama günlüğünün &düzeyi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1881 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1900 msgid "&Default editor:" -msgstr "Varsayılan &düzenleyici:" +msgstr "Varsayılan &Düzenleyici:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:135 #: ../../locales/../src/interface/resources/xrc/menus.xrc:349 @@ -367,44 +375,54 @@ 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: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:2836 #: ../../locales/../src/interface/resources/xrc/menus.xrc:276 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:567 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:571 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:59 msgid "&Delete" -msgstr "&Silin" +msgstr "&Sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3196 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" -msgstr "&Sembolik bağlantıyı silin" +msgstr "&Sembolik bağlantıyı sil" #: ../../locales/../src/interface/resources/xrc/menus.xrc:70 msgid "&Directory comparison" msgstr "&Klasör karşılaştırma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1794 +#: ../../locales/../src/interface/state.cpp:887 +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 +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 msgid "&Discard local file then download and edit file anew" -msgstr "Yerel &dosyayı boşverip, dosyayı yeniden indirerek düzenleyin" +msgstr "Yerel &dosyayı boşver, dosyayı yeniden indirip düzenle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:185 msgid "&Disconnect" -msgstr "&Bağlantıyı kesin" +msgstr "&Bağlantıyı kes" #: ../../locales/../src/interface/resources/xrc/menus.xrc:381 msgid "&Disconnect from server" -msgstr "Sunucu ile &bağlantıyı kesin" +msgstr "Sunucu ile &bağlantıyı kes" -#: ../../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 "Ortalama aktarım hızı yerine &anlık aktarım hızı görüntülensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1589 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1608 msgid "&Display size in bytes" msgstr "&Boyut görüntülensin (bayt)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3629 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "Parolalar &hatırlanmasın (önerilir)" @@ -416,50 +434,54 @@ 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:1796 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1815 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:483 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:487 msgid "&Download" -msgstr "İn&dirin" +msgstr "İn&dir" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" -msgstr "Şuraya İn&dirin:" +msgstr "Şuraya İn&dir:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:596 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:600 msgid "&Download..." -msgstr "İn&dirin..." +msgstr "İn&dir..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1382 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1160 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1397 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1179 msgid "&Downloads:" -msgstr "Karşıdan in&dirme:" +msgstr "İn&dirme:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:45 #: ../../locales/../src/interface/resources/xrc/menus.xrc:259 msgid "&Edit" -msgstr "Düz&en" +msgstr "Düz&enle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1149 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1165 msgid "&Edit filter rules..." -msgstr "Süzg&eç kurallarını düzenleyin..." +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:522 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:623 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:526 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:627 msgid "&Enable" -msgstr "&Etkinleştirin" +msgstr "&Etkinleştir" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:687 +msgid "&Enable compression" +msgstr "Sıkıştırma &kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3518 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3555 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:896 msgid "&Enable speed limits" msgstr "Hız sınırlarına &uyulsun" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:486 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:535 msgid "&Encoding:" msgstr "&Kodlama:" @@ -467,11 +489,11 @@ msgid "&Encryption:" msgstr "Şifr&eleme:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:417 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:420 msgid "&Enter custom command..." msgstr "Öz&el komut yazın..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3453 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "Bağlantı y&eni sekmede açılsın" @@ -479,14 +501,14 @@ msgid "&Execute" msgstr "Çalış&tırma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1556 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1571 msgid "&Export Site Manager entries" -msgstr "Sit&e bilgilerini verin" +msgstr "Sit&e bilgileri verilsin" #: ../../locales/../src/interface/resources/xrc/menus.xrc:27 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:577 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:581 msgid "&Export..." -msgstr "V&erin..." +msgstr "Bilgileri V&er..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:426 msgid "&Fall back to active mode" @@ -496,7 +518,7 @@ msgid "&File" msgstr "&Dosya" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:519 msgid "&File Attributes..." msgstr "&Dosya İzinleri..." @@ -504,27 +526,27 @@ msgid "&File permissions..." msgstr "&Dosya izinleri..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2223 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2248 msgid "&File:" msgstr "&Dosya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1270 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1285 msgid "&Filter conditions:" -msgstr "&Süzme kısıtları:" +msgstr "&Süzme ölçütleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1046 msgid "&Filter sets:" msgstr "&Süzme setleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1201 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1216 msgid "&Filters:" msgstr "&Süzgeçler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1748 msgid "&Finish editing and delete local file" -msgstr "Düzenlemeyi &bitirip yerel dosyayı silin" +msgstr "Düzenlemeyi &bitirip yerel dosyayı sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3121 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -532,7 +554,7 @@ "Uzak yollara aldırmadan, bulunan tüm dosyalar doğrudan hede&f klasöre " "indirilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3203 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "Sembolik bağlantı izlensin, hede&f klasörün içeriği silinsin" @@ -544,11 +566,11 @@ msgid "&Getting help..." msgstr "&Yardım alın..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2575 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2600 msgid "&Global bookmark" msgstr "&Küresel yer imi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:705 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:724 msgid "&HTTP/1.1 using CONNECT method" msgstr "CONNECT yöntemi kullanılarak &HTTP/1.1" @@ -557,7 +579,7 @@ msgstr "&Yardım" #: ../../locales/../src/interface/resources/xrc/menus.xrc:87 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:536 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:540 msgid "&Hide identical files" msgstr "Eş dosyalar &gizlensin" @@ -569,37 +591,41 @@ msgid "&Highest available port:" msgstr "&Kullanılabilecek en büyük kapı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2370 +#: ../../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 "&Sunucu:" -#: ../../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 ikili önekleri (örnek 1KiB = 1024 bayt)" -#: ../../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 (örnek: 2007-09-15)" #: ../../locales/../src/interface/resources/xrc/menus.xrc:30 msgid "&Import..." -msgstr "&Alın..." +msgstr "Bilgileri &Al..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1972 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1991 msgid "&Inherit system's filetype associations" msgstr "Sistem dosya tipi &ilişkileri devralınsın" #: ../../locales/../src/interface/resources/xrc/update.xrc:109 msgid "&Install new version" -msgstr "&Yeni sürümü yükleyin" +msgstr "&Yeni sürüm yüklensin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3151 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/settings.xrc:1259 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:230 +msgid "&Key file:" +msgstr "&Anahtar dosyası:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1278 msgid "&Layout of file and directory panes:" msgstr "Dosya ve k&lasör pencerelerinin yerleşimi:" @@ -607,28 +633,28 @@ 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:415 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:464 msgid "&Limit number of simultaneous connections" -msgstr "Eş zaman&lı bağlantı sayısı sınırlandırılsın" +msgstr "Eş zaman&lı bağlantı sayısı sınırlansın" #: ../../locales/../src/interface/resources/xrc/menus.xrc:114 msgid "&Local directory tree" msgstr "Yere&l klasör ağacı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2629 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2712 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "Yere&l klasör:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2103 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2122 msgid "&Log to file" msgstr "Gün&lük dosyalansın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:165 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:175 msgid "&Logon Type:" msgstr "&Oturum Açma Tipi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2425 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2450 msgid "&Logontype:" msgstr "&Oturum Açma Tipi:" @@ -638,13 +664,13 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:210 msgid "&Manage bookmarks..." -msgstr "Yer i&mlerini yönetin..." +msgstr "Yer i&mleri yönetimi..." #: ../../locales/../src/interface/resources/xrc/menus.xrc:169 msgid "&Manual transfer..." msgstr "El ile aktarı&m..." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:474 msgid "&Maximum number of connections:" msgstr "&En fazla bağlantı sayısı:" @@ -654,17 +680,17 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:110 msgid "&Message log" -msgstr "İ&leti günlüğü" +msgstr "&Günlük kaydı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1356 msgid "&Minimize to tray" msgstr "Siste&m tepsisine küçültülsün" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1742 msgid "&Name sorting mode:" msgstr "A&d sıralama kipi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2602 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2627 msgid "&Name:" msgstr "&Ad:" @@ -672,29 +698,29 @@ msgid "&Network configuration wizard..." msgstr "Ağ ayarla&ma yardımcısı..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1217 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1232 msgid "&New" msgstr "Ye&ni" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:35 msgid "&New Site" -msgstr "Site E&kleyin" +msgstr "Site E&kle" -#: ../../locales/../src/interface/Mainfrm.cpp:1733 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "Ye&ni bir sürüm yayınlanmış!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "İ&leri >" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1746 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1869 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1884 msgid "&No" msgstr "&Hayır" #: ../../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 "&Yok" @@ -707,8 +733,8 @@ msgstr "&Sayısal değer:" #: ../../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:2885 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:597 msgid "&OK" msgstr "&Tamam" @@ -717,15 +743,15 @@ msgstr "&AÇIK" #: ../../locales/../src/interface/resources/xrc/menus.xrc:255 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:553 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:557 msgid "&Open" -msgstr "&Açın" +msgstr "&Aç" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:134 msgid "&Overwrite" msgstr "Ü&zerine Yazılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:406 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:455 msgid "&Passive" msgstr "&Pasif" @@ -737,7 +763,7 @@ msgid "&Play sound" msgstr "&Ses çalınsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2383 +#: ../../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:" @@ -745,81 +771,89 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:153 msgid "&Preserve timestamps of transferred files" -msgstr "Dosyaların zaman damgaları &korunsun" +msgstr "Dosya zaman damgaları &korunsun" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1620 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1635 msgid "&Queue" msgstr "Aktarım &kuyruğu" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:97 msgid "&Quickconnect" -msgstr "&Hızlı bağlanın" +msgstr "&Hızlı bağlan" #: ../../locales/../src/interface/resources/xrc/menus.xrc:106 msgid "&Quickconnect bar" msgstr "&Hızlı bağlantı çubuğu" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1504 +msgid "&Quickconnect history" +msgstr "&Hızlı bağlantı geçmişi" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:409 msgid "&Read" msgstr "&Okuma" #: ../../locales/../src/interface/resources/xrc/menus.xrc:181 msgid "&Reconnect" -msgstr "&Yeniden bağlanın" +msgstr "&Yeniden bağlan" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1511 +msgid "&Reconnect information" +msgstr "&Yeniden bağlanma bilgileri" #: ../../locales/../src/interface/resources/xrc/menus.xrc:61 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:622 msgid "&Refresh" -msgstr "&Yenileyin" +msgstr "&Yenile" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:360 msgid "&Remember password until FileZilla is closed" msgstr "Parola, FileZilla kapatılana kadar hatırlansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3623 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 msgid "&Remember passwords" msgstr "Pa&rolalar hatırlansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2656 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2736 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "Uzak klasö&r:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2259 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2284 msgid "&Remote path:" msgstr "&Uzak yol:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1117 msgid "&Remove" -msgstr "&Silin" +msgstr "&Sil" #: ../../locales/../src/interface/resources/xrc/settings.xrc:650 msgid "&Remove key" -msgstr "Anahta&rı Silin" +msgstr "Anahta&rı Sil" #: ../../locales/../src/interface/resources/xrc/menus.xrc:346 msgid "&Remove selected" -msgstr "Seçilmişi kaldı&rın" +msgstr "Seçilmişi kaldı&r" -#: ../../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:2830 #: ../../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:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:575 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:53 msgid "&Rename" -msgstr "Ad Değişti&rin" +msgstr "Yeniden Adlandı&r" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1048 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1064 msgid "&Rename..." -msgstr "Yeniden Adlandı&rın..." +msgstr "Yeniden Adlandı&r..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1787 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1802 msgid "&Reopen local file" -msgstr "Ye&rel dosyayı yeniden açın" +msgstr "Ye&rel dosyayı yeniden aç" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:999 msgid "&Replace invalid characters with:" msgstr "Geçe&rsiz karakterler şununla değiştirilsin:" @@ -827,68 +861,68 @@ msgid "&Report a bug..." msgstr "Hata bildi&rin (İngilizce)..." -#: ../../locales/../src/interface/resources/xrc/menus.xrc:451 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:449 msgid "&Reset and requeue all" -msgstr "Bu&rayı boşaltın ve tümünü yeniden kuyruğa alın" +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ı yeniden başlatın" +msgstr "Ya&rdımcıyı baştan başlat" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:164 msgid "&Resume" -msgstr "Sü&rdürün" +msgstr "Sü&rdür" #: ../../locales/../src/interface/resources/xrc/menus.xrc:385 msgid "&Run command..." -msgstr "Komut çalıştı&rın..." +msgstr "Komut çalıştı&r..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:76 msgid "&Run configuration wizard now..." -msgstr "Ağ aya&r yardımcısını çalıştırın..." +msgstr "Ağ aya&r yardımcısını başlat..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2065 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2084 msgid "&Run update check now..." -msgstr "Güncellemele&ri denetleyin..." +msgstr "Güncellemele&ri denetle..." #: ../../locales/../src/interface/resources/xrc/settings.xrc:468 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" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1042 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1058 msgid "&Save as..." -msgstr "&Farklı kaydedin..." +msgstr "&Farklı kaydet..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2976 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" -msgstr "&Arayın" +msgstr "&Ara" #: ../../locales/../src/interface/resources/xrc/menus.xrc:190 msgid "&Search remote files..." -msgstr "&Uzak dosyalarda arayın..." +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:1848 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1867 msgid "&Select language:" -msgstr "Dil &seçimi:" +msgstr "Dil &Seçimi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2111 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2136 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:2298 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2323 #: ../../locales/../src/interface/resources/xrc/menus.xrc:174 msgid "&Server" msgstr "&Sunucu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1614 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1629 msgid "&Settings" msgstr "Aya&rlar" @@ -896,11 +930,11 @@ msgid "&Settings..." msgstr "Aya&rlar..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2204 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2223 msgid "&Show debug menu" msgstr "Hata ayıklama menü&sü görüntülensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:421 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:424 msgid "&Show detailed log" msgstr "A&yrıntılı günlüğe bakın" @@ -908,43 +942,47 @@ msgid "&Show message" msgstr "İleti gö&rüntülensin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2098 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2117 msgid "&Show timestamps in message log" -msgstr "İleti günlüğüne &zaman damgaları eklensin" +msgstr "Günlük kayıtlarına &zaman damgası eklensin" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1517 +msgid "&Site Manager entries" +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:2583 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2608 msgid "&Site-specific bookmark" msgstr "&Siteye özgü yer imi" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:180 msgid "&Skip" -msgstr "&Atlayın" +msgstr "&Atla" #: ../../locales/../src/interface/resources/xrc/menus.xrc:165 msgid "&Speed limits" msgstr "Hız &sınırlaması" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3132 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" -msgstr "Aktarıma &hemen başlayın" +msgstr "Aktarıma &hemen başla" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1280 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 msgid "&Swap local and remote panes" -msgstr "&Yerel ve Uzak panellerin yeri değiştirilsin" +msgstr "&Yerel ve Uzak panellerin yerini değiştir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:442 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:440 msgid "&TLS Ciphers" msgstr "&TLS Şifreleri" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" -msgstr "&Sınayın" +msgstr "&Sına" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1431 msgid "&Theme:" msgstr "&Tema:" @@ -952,45 +990,46 @@ msgid "&Transfer" msgstr "Ak&tarım" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:382 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:431 msgid "&Transfer mode:" msgstr "Ak&tarım yöntemi:" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1523 #: ../../locales/../src/interface/resources/xrc/menus.xrc:122 msgid "&Transfer queue" msgstr "Ak&tarım kuyruğu" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1122 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1141 msgid "&Treat dotfiles as ASCII files" msgstr "Noktalı dosyalar ASCII olarak kabul e&dilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1909 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1924 msgid "&Unedit" -msgstr "&Düzeltmeyin" +msgstr "&Düzeltme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1006 msgid "&Update cached key for this host" msgstr "B&u sunucunun önbellekteki anahtarı güncellensin" #: ../../locales/../src/interface/resources/xrc/menus.xrc:240 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:542 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:546 msgid "&Upload" -msgstr "&Karşıya yükleyin" +msgstr "&Yükle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1405 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1420 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1200 msgid "&Uploads:" -msgstr "&Karşıya yükleme:" +msgstr "&Yükleme:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "Özel program k&ullanılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:316 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:358 msgid "&Use synchronized browsing" msgstr "Eş zamanlı tarama k&ullanılsın" -#: ../../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 "Metin dosyaları için varsayılan sistem düzenleyicisi k&ullanılsın" @@ -1002,13 +1041,13 @@ 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:1612 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1631 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:2437 -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:179 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2462 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:189 msgid "&User:" msgstr "K&ullanıcı:" @@ -1016,7 +1055,7 @@ msgid "&Username:" msgstr "K&ullanıcı Adı:" -#: ../../locales/../src/interface/Mainfrm.cpp:1727 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Sürüm %s" @@ -1026,48 +1065,48 @@ msgstr "&Görünüm" #: ../../locales/../src/interface/resources/xrc/menus.xrc:300 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:599 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:603 msgid "&View/Edit" -msgstr "&Görün/Düzenleyin" +msgstr "&Göster/Düzenle" -#: ../../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 "" "&Yerel olarak düzenlenen dosyalar izlenerek değişikliklerin kayıt durumu " "sorulsun." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2041 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2060 msgid "&When checking for updates, check for:" -msgstr "Şu &güncelleme sürümleri denetlensin:" +msgstr "&Denetlenecek güncelleme sürümleri:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:415 msgid "&Write" msgstr "&Yazma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1740 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1863 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1755 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1878 msgid "&Yes" msgstr "&Evet" -#: ../../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' yok ya da erişilemiyor." -#: ../../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' bir klasör adı değil." -#: ../../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:967 msgid "'Account' logontype not supported by selected protocol" msgstr "'Hesap' ile oturum açma tipi bu iletişim kuralı için desteklenmiyor" -#: ../../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." @@ -1075,7 +1114,7 @@ "'Normal' ve 'Hesap' oturum açma tipleri kullanılamıyor. Onun yerine 'Parola " "sorulsun' tipi kullanılıyor." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:971 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:982 msgid "" "'Normal' and 'Account' logontypes are not available. Your entry has been " "changed to 'Ask for password'." @@ -1083,7 +1122,7 @@ "'Normal' ve 'Hesap' oturum açma tipleri kullanılamıyor. Kaydınız 'Parola " "sorulsun' olarak değiştirildi." -#: ../../locales/../src/interface/Mainfrm.cpp:611 +#: ../../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 " @@ -1093,15 +1132,20 @@ "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: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 nesne süzüldü)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:839 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:860 +#: ../../locales/../src/interface/update_dialog.cpp:254 +#, c-format +msgid "(%u%% downloaded)" +msgstr "(%u%% indirildi)" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:858 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:879 msgid "(0 for no limit)" msgstr "(Sınırsız için 0)" @@ -1113,32 +1157,32 @@ msgid "(0-999 seconds)" msgstr "(0-999 saniye)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:818 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:837 msgid "(1-10)" msgstr "(En çok: 1-10)" #: ../../locales/../src/interface/resources/xrc/settings.xrc:109 -msgid "(5-9999, 0 to disable)" -msgstr "(5-9999, kapatmak için 0)" +msgid "(10-9999, 0 to disable)" +msgstr "(10-9999, kapatmak için 0)" -#: ../../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 %d.%d olarak ayarlandı)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1550 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1569 msgid "(example: %H:%M)" msgstr "(örnek: %H:%M)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1501 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 msgid "(example: %Y-%m-%d)" msgstr "(örnek: %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: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 "(ile %s/s)" @@ -1167,35 +1211,35 @@ msgid "-s cannot be used together with an FTP URL." msgstr "-s ile FTP İnternet adresi birlikte kullanılamaz." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2225 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2244 msgid "0 - None" msgstr "0 - Yok" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2226 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2245 msgid "1 - Warning" msgstr "1 - Uyarı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2227 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2246 msgid "2 - Info" msgstr "2 - Bilgi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2247 msgid "3 - Verbose" msgstr "3 - Ayrıntılı" -#: ../../locales/../src/interface/aboutdialog.cpp:97 +#: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" msgstr "32-bit sistem" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2229 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" msgstr "4 - Hata ayıklama" -#: ../../locales/../src/interface/aboutdialog.cpp:95 +#: ../../locales/../src/interface/aboutdialog.cpp:96 msgid "64-bit system" msgstr "64-bit sistem" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Geri" @@ -1203,7 +1247,7 @@ msgid "?" msgstr "?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:109 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:103 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:" @@ -1213,8 +1257,8 @@ msgstr "Varsayılan bir düzenleyici ayarlamalısınız." #: ../../locales/../src/interface/RemoteListView.cpp:157 -#: ../../locales/../src/interface/RemoteTreeView.cpp:116 -#: ../../locales/../src/interface/state.cpp:808 +#: ../../locales/../src/interface/RemoteTreeView.cpp:118 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Bir klasör kendi alt klasörlerinden birine sürüklenemez." @@ -1225,24 +1269,24 @@ "and asks the server to connect to it." msgstr "" "Bazı sunucular pasif kipe izin vermez ya da yanlış ayarlanmışlardır. Böyle " -"durumlarda aktif kipi kullanmalısınız. Aktif kipte, FileZilla bir kapı " -"açarak, sunucuya buna bağlanmasını söyler." +"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:1659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1674 msgid "A file previously opened has been changed." -msgstr "Önceden açılmış olan bir dosya değiştirilmiş." +msgstr "Açık bir dosya değiştirilmiş." -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1644 msgid "A file with that name is already being transferred." msgstr "Aynı adlı bir dosya zaten aktarıldı." -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1648 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:653 +#: ../../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 " @@ -1250,16 +1294,16 @@ "Unless you fix this problem, files might be missing in the file listings.\n" "No further warning will be displayed this session." msgstr "" -"Yerel bir dosya adı anlaşılamıyor.\n" +"Yerel bir dosya adı anlaşılamadı.\n" "LC_CTYPE (ya da LC_ALL) ortam değişkeninin doğru ayarlandığından emin olun.\n" -"Bu sorunu çözmezseniz listelemelerde bazı dosyalar görünmeyebilir.\n" +"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 msgid "A new version of FileZilla is available:" msgstr "Yeni bir FileZilla sürümü yayınlanmış:" -#: ../../locales/../src/interface/Mainfrm.cpp:674 +#: ../../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." @@ -1276,7 +1320,7 @@ "Normal bir sunucu buna gerek duymaz. Kullanmak zorundaysanız sunucu " "yöneticisi ile görüşün." -#: ../../locales/../src/interface/state.cpp:283 +#: ../../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?" @@ -1286,18 +1330,18 @@ "etmek ister misiniz?" #: ../../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:590 +#: ../../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 "E&kleyin" +msgstr "E&kle" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1228 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1247 msgid "A&llow resume of ASCII files" -msgstr "ASCII dosya&lar sürdürülebilsin" +msgstr "ASCII Dosya&lar Sürdürülebilsin" #: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to downloads" @@ -1305,17 +1349,17 @@ #: ../../locales/../src/interface/fileexistsdlg.cpp:72 msgid "A&pply only to uploads" -msgstr "Y&alnız karşıya yüklemelere uygulansın" +msgstr "Y&alnız yüklemelere uygulansın" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:541 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:477 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:478 msgid "A&utomatically remove successful transfers" msgstr "T&amamlanan aktarımlar kendiliğinden silinsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2514 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2539 msgid "ASCII" msgstr "ASCII" @@ -1323,19 +1367,19 @@ msgid "About FileZilla" msgstr "FileZilla Hakkında" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 msgid "Above the file lists" msgstr "Yerel ve uzak dosya gezginlerinin üzerinde" -#: ../../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: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 "Hesap" @@ -1343,11 +1387,11 @@ msgid "Action after queue &completion" msgstr "Kuyruk tamamlandıktan sonra yapıla&cak işlem" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1902 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1917 msgid "Action on selected file:" msgstr "Seçili dosyaya yapılacak işlem:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1782 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1797 msgid "Action to perform:" msgstr "Yapılacak işlem:" @@ -1359,14 +1403,14 @@ msgid "Active mode" msgstr "Aktif Kip" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:614 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:608 +#: ../../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." @@ -1374,7 +1418,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:596 +#: ../../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 " @@ -1385,14 +1429,14 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:398 msgid "Active mode IP" -msgstr "Aktif kip IP" +msgstr "Aktif Kip IP Adresi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Dosyalar yalnız &kuyruğa eklensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:490 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:549 +#: ../../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 "Seçili klasörler aktarım kuyruğuna eklensin" @@ -1401,20 +1445,20 @@ msgid "Add selected files and folders to the transfer queue" msgstr "Seçili dosya ve klasörler aktarım kuyruğuna eklensin" -#: ../../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 "Aktarım kuyruğuna eklensin" -#: ../../locales/../src/engine/proxy.cpp:507 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Adres tipi desteklenmiyor" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:241 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:283 msgid "Advanced" msgstr "Gelişmiş" -#: ../../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 " @@ -1422,21 +1466,21 @@ "expected and might even damage your system. Use beta versions and nightly " "builds at your own risk." msgstr "" -"Öneri: Yeni özellikleri sınamak istediğiniz durumların dışında, kararlı " -"sürümleri kullanın. Beta ve gecelik yapımlar, sınama amacıyla " +"Öneri: Yeni özellikleri denemek istediğiniz durumların dışında, kararlı " +"sürümleri kullanın. Beta 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." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3470 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Her &zaman şu işlem yapılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1996 msgid "Algorithm:" msgstr "Algoritma:" -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Tüm dosyalar aktarıldı" @@ -1444,7 +1488,7 @@ 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:3019 +#: ../../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." @@ -1458,11 +1502,11 @@ 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:3430 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Zaten bağlı" -#: ../../locales/../src/interface/verifycertdialog.cpp:76 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Diğer adlar:" @@ -1490,7 +1534,7 @@ msgstr "" "Alternatif olarak, son sürümü FileZilla web sitesinden indirebilirsiniz:" -#: ../../locales/../src/interface/QueueView.cpp:1962 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1499,7 +1543,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:1867 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1508,45 +1552,37 @@ "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:1933 +#: ../../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 "Hedefte, sürüklediğiniz nesne ile aynı adı taşıyan bir nesne var." -#: ../../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: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 "Anonim" -#: ../../locales/../src/interface/state.cpp:992 +#: ../../locales/../src/interface/state.cpp:937 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:792 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:808 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/sitemanager_dialog.cpp:740 -msgid "" -"Any changes made in the Site Manager will not be saved unless you repair the " -"file." -msgstr "" -"Dosyayı onarmadıkça Site Yöneticisinde yaptığınız değişiklikler " -"kaydedilmeyecek." - #: ../../locales/../src/interface/filter.cpp:213 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:971 +#: ../../locales/../src/interface/filter.cpp:970 msgid "Any changes made to the filters will not be saved." msgstr "Süzgeçlerde yaptığınız değişiklikler kaydedilmeyecek." @@ -1554,9 +1590,9 @@ msgid "App&ly to directories only" msgstr "Yalnız k&lasörlere uygulansın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1175 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1191 msgid "Apply" -msgstr "Uygulayın" +msgstr "Uygula" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:213 msgid "Apply to ¤t queue only" @@ -1570,27 +1606,27 @@ msgid "Archive" msgstr "Arşiv" -#: ../../locales/../src/engine/socket.cpp:1184 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Argüman tampon bellek taşması" -#: ../../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 "Aktarım kuyruğu bölümünde sekme olarak" -#: ../../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: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 "Ne yapılacağı sorulsun" -#: ../../locales/../src/engine/server.cpp:832 -#: ../../locales/../src/engine/server.cpp:851 -#: ../../locales/../src/interface/manual_transfer.cpp:188 +#: ../../locales/../src/engine/server.cpp:856 +#: ../../locales/../src/engine/server.cpp:877 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" -msgstr "Parola sorulsun" +msgstr "Parola sorulan" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:271 msgid "Ask operating system for a port." @@ -1600,7 +1636,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:3379 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "FileZilla forumlarında soru sorabilirsiniz" @@ -1608,9 +1644,9 @@ msgid "Associated program not found:" msgstr "İlgili program bulunamadı:" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:709 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:686 msgid "At least one filter condition is incomplete" -msgstr "En az bir süzme kısıtı eksik kalmış" +msgstr "En az bir süzme ölçütü eksik kalmış" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:346 msgid "At this point, all required information has been gathered." @@ -1620,78 +1656,82 @@ msgid "Attribute" msgstr "İzinler" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:639 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Kimlik doğrulanamadı." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1421 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1440 msgid "Author:" msgstr "Yazar:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2492 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2517 msgid "Auto" msgstr "Otomatik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1061 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1080 msgid "Automatic file type classification" -msgstr "Otomatik dosya tipi sınıflandırması" +msgstr "Otomatik Dosya Tipi Sınıflandırması" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1452 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 msgid "Available sizes" -msgstr "Kullanılabilecek boyutlar" +msgstr "Kullanılabilecek Boyutlar" -#: ../../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:309 msgid "B&ypass proxy" msgstr "&Vekil sunucu atlansın" -#: ../../locales/../src/engine/socket.cpp:1149 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Dosya belirteci bozuk" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3336 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Basit kullanım bilgileri" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1326 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1345 msgid "Behaviour" msgstr "Davranış" -#: ../../locales/../src/interface/edithandler.cpp:1131 -#: ../../locales/../src/interface/edithandler.cpp:1159 +#: ../../locales/../src/interface/edithandler.cpp:1114 +#: ../../locales/../src/interface/edithandler.cpp:1142 msgid "Being edited" msgstr "Düzenlendi" -#: ../../locales/../src/engine/tlssocket.cpp:1037 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Dikkat! Sertifika geçersiz kılınmış" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2519 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2544 msgid "Binary" msgstr "İkili" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1269 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1288 msgid "Blackboard" msgstr "Karatahta" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:269 -#: ../../locales/../src/interface/menu_bar.cpp:307 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:409 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:261 +#: ../../locales/../src/interface/menu_bar.cpp:304 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:418 msgid "Bookmark" msgstr "Yer imi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2770 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Yer imi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2759 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Yer imleri" +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:249 +msgid "Browse..." +msgstr "Gözat..." + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:669 msgid "Build date:" msgstr "Yapım tarihi:" @@ -1700,7 +1740,7 @@ msgid "Build information" msgstr "Yapım bilgileri" -#: ../../locales/../src/interface/verifycertdialog.cpp:187 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "İş kategorisi:" @@ -1716,90 +1756,95 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:176 msgid "C&ancel current operation" -msgstr "Yürürlükteki işlemi ipt&al edin" +msgstr "Yürürlükteki işlemi ipt&al et" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:428 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:431 msgid "C&lear all" -msgstr "Hepsini temiz&leyin" +msgstr "Hepsini temiz&le" #: ../../locales/../src/interface/resources/xrc/menus.xrc:328 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:511 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:515 msgid "C&opy URL(s) to clipboard" -msgstr "İnternet adresini pan&oya kopyalayın" +msgstr "İnternet adresini pan&oya kopyala" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1488 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1507 msgid "C&ustom" msgstr "İsteğe &Göre Uyarlanmış" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1977 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1996 msgid "C&ustom filetype associations:" msgstr "Ö&zel dosya tipi ilişkileri:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1606 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1197 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 +msgid "CPU features:" +msgstr "CPU Özellikleri:" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "Sunucunun saat dilimi farkı hesaplanıyor..." -#: ../../locales/../src/engine/transfersocket.cpp:691 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Dosya okunamıyor" -#: ../../locales/../src/engine/transfersocket.cpp:669 -#: ../../locales/../src/engine/transfersocket.cpp:742 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:718 msgid "Can't write data to file." msgstr "Veri dosyaya yazılamıyor." -#: ../../locales/../src/engine/transfersocket.cpp:671 -#: ../../locales/../src/engine/transfersocket.cpp:744 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:720 #, 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: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: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 "İptal" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:52 msgid "Cancel current operation" -msgstr "Yürürlükteki işlemi iptal edin" +msgstr "Yürürlükteki işlemi iptal et" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:53 msgid "Cancels the current operation" msgstr "Yürürlükteki işlemi iptal eder" -#: ../../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 "'%s' erişilemiyor, sürücü hazır değil ya da bir ortam takılmamış." -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "Sunucu Site Yöneticisine eklenemiyor" -#: ../../locales/../src/engine/socket.cpp:1201 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "İstenen adres atanamadı" -#: ../../locales/../src/interface/context_control.cpp:345 +#: ../../locales/../src/interface/context_control.cpp:352 msgid "" "Cannot close tab while busy.\n" "Cancel current operation and close tab?" @@ -1807,7 +1852,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:74 +#: ../../locales/../src/interface/listingcomparison.cpp:71 msgid "" "Cannot compare directories, different filters for local and remote " "directories are enabled" @@ -1815,30 +1860,26 @@ "Yerel ve uzaktaki klasörler için farklı süzgeçler etkinleştirildiğinden " "klasörler karşılaştırılamıyor" -#: ../../locales/../src/interface/RemoteListView.cpp:2365 -msgid "Cannot compare directories, not connected to a server." -msgstr "Sunucuyla bağlantı kurulamadığından klasörler karşılaştırılamıyor." - #: ../../locales/../src/interface/filteredit.cpp:143 msgid "Cannot create new filter" msgstr "Yeni süzgeç oluşturulamıyor" -#: ../../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:1574 +#: ../../locales/../src/interface/edithandler.cpp:1622 +#: ../../locales/../src/interface/LocalListView.cpp:1705 +#: ../../locales/../src/interface/search.cpp:696 msgid "Cannot edit file" msgstr "Dosya düzenlenemiyor" -#: ../../locales/../src/interface/LocalListView.cpp:1602 +#: ../../locales/../src/interface/LocalListView.cpp:1587 msgid "Cannot edit file, not connected to any server." msgstr "Dosya düzenlenemiyor, hiç bir sunucuya bağlı değilsiniz." -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Cannot edit file, remote path unknown." msgstr "Uzaktaki yol bilinmediğinden dosya düzenlenemiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:325 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1850,93 +1891,87 @@ msgid "Cannot load Quickconnect bar from resource file" msgstr "Hızlı Bağlantı çubuğu kaynak dosyasından yüklenemiyor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389 -msgid "Cannot load keyfile" -msgstr "Anahtar dosya yüklenemiyor" +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:108 +msgid "Cannot load key file" +msgstr "Anahtar dosyası yüklenemedi" -#: ../../locales/../src/interface/Mainfrm.cpp:1035 +#: ../../locales/../src/interface/Mainfrm.cpp:994 msgid "Cannot load toolbar from resource file" msgstr "Araç çubuğu kaynak dosyasından yüklenemiyor" -#: ../../locales/../src/interface/manual_transfer.cpp:463 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Parola hatırlanamıyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Cannot rename entry" msgstr "Kayıt yeniden adlandırılamıyor" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Dosya yeniden adlandırılamıyor" -#: ../../locales/../src/engine/proxy.cpp:135 +#: ../../locales/../src/engine/proxy.cpp:172 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" -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Süzgeç seti kaydedilemiyor" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Süzgeç seçilemiyor" -#: ../../locales/../src/interface/edithandler.cpp:1509 -#: ../../locales/../src/interface/edithandler.cpp:1514 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../locales/../src/interface/edithandler.cpp:1472 +#: ../../locales/../src/interface/edithandler.cpp:1476 +#: ../../locales/../src/interface/edithandler.cpp:1511 msgid "Cannot set file association" msgstr "Dosya ilişkisi ayarlanamıyor" -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "Cannot show dialog" msgstr "Pencere görüntülenemiyor" -#: ../../locales/../src/interface/edithandler.cpp:1687 +#: ../../locales/../src/interface/edithandler.cpp:1644 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:1732 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 msgid "Case insensitive" msgstr "Büyük küçük harfe duyarsız" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1731 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1750 msgid "Case insensitive (default)" msgstr "Büyük küçük harfe duyarsız (varsayılan)" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1752 msgid "Case sensitive" msgstr "Büyük küçük harfe duyarlı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1753 msgid "Case sensitive (default)" msgstr "Büyük küçük harfe duyarlı (varsayılan)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1482 -msgid "Categories" -msgstr "Kategoriler" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1497 +msgid "Categories to clear" +msgstr "Silinecek kategoriler" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Certificate and session data are not available yet." msgstr "Sertifika ve oturum verileri henüz bilinmiyor." -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:274 -msgid "Certificate details" -msgstr "Sertifika ayrıntıları" - #: ../../locales/../src/interface/resources/xrc/certificate.xrc:29 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:294 msgid "Certificate in chain:" msgstr "Sertifika bağlantısı:" -#: ../../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 "Sertifika yayıncısı" +msgstr "Sertifika Yayıncısı" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:312 msgid "Challenge:" @@ -1944,47 +1979,48 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:390 msgid "Change file attributes" -msgstr "Dosya izinlerini değiştirin" +msgstr "Dosya izinlerini değiştir" #: ../../locales/../src/interface/resources/xrc/menus.xrc:333 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 msgid "Change the file permissions." -msgstr "Dosya izinlerini değiştirin." +msgstr "Dosya izinlerini değiştir." -#: ../../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 "" -"Günlük dosyası ayarlarını değiştirmek için FileZilla yeniden başlatılmalıdır." +"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:653 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Karakter kodlaması sorunu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:448 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:497 msgid "Charset" msgstr "Karakter Seti" #: ../../locales/../src/interface/resources/xrc/menus.xrc:218 msgid "Check for &updates..." -msgstr "Güncellemeleri &denetleyin..." +msgstr "Güncellemeleri &denetle..." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2023 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2042 msgid "Check for FileZilla &updates automatically:" -msgstr "FileZilla güncellemeleri ş&u aralıkla denetlensin:" +msgstr "&Güncelleme denetim sıklığı:" #: ../../locales/../src/interface/resources/xrc/update.xrc:4 msgid "Check for Updates" -msgstr "Güncellemeleri denetleyin" +msgstr "Güncellemeleri denetle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:219 msgid "Check for newer versions of FileZilla" -msgstr "Yeni FileZilla sürümlerini denetleyin" +msgstr "Yeni FileZilla sürümlerini denetle" #: ../../locales/../src/interface/update_dialog.cpp:57 msgid "Check for updates failed" msgstr "Güncellemeler denetlenemedi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -1992,7 +2028,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:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2000,7 +2036,7 @@ "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:777 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Doğru dış IP adresi denetleniyor" @@ -2008,171 +2044,158 @@ msgid "Checking for updates..." msgstr "Güncellemeler denetleniyor..." -#: ../../locales/../src/interface/updater.cpp:710 +#: ../../locales/../src/interface/updater.cpp:716 #, c-format msgid "Checksum match on file %s\n" msgstr "%s dosyasının sağlaması tutuyor\n" -#: ../../locales/../src/interface/updater.cpp:706 +#: ../../locales/../src/interface/updater.cpp:712 #, c-format msgid "Checksum mismatch on file %s\n" msgstr "%s dosyasının sağlaması tutmuyor\n" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1447 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1483 +msgid "Choose a key file" +msgstr "Bir anahtar dosyası seçin" + +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1514 msgid "Choose the default local directory" msgstr "Varsayılan yerel klasörü seçin" -#: ../../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:124 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:364 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2245 msgid "Choose the local directory" msgstr "Yerel klasörü seçin" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "İri veri uygunsuz olarak sonlandırıldı" -#: ../../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 "Şifre:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:21 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:611 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:615 msgid "Cl&ose tab" -msgstr "Sekmeyi &kapatın" +msgstr "Sekmeyi &kapat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1266 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1285 msgid "Classic" msgstr "Klasik" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1502 -msgid "Clear &Site Manager entries" -msgstr "&Site Yöneticisi kayıtlarını silin" - -#: ../../locales/../src/interface/resources/xrc/menus.xrc:433 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:436 msgid "Clear &layout cache" -msgstr "Arayüz önbelleğini temiz&leyin" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1489 -msgid "Clear &quickconnect history" -msgstr "&Hızlı bağlantı geçmişini silin" +msgstr "Arayüz önbelleğini temiz&le" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1496 -msgid "Clear &reconnect information" -msgstr "&Yeniden bağlanma bilgisini silin" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1508 -msgid "Clear &transfer queue" -msgstr "Ak&tarım kuyruğunu silin" - -#: ../../locales/../src/interface/quickconnectbar.cpp:147 +#: ../../locales/../src/interface/quickconnectbar.cpp:150 msgid "Clear history" -msgstr "Eski hızlı bağlantı bilgilerini silin" +msgstr "Önceki hızlı bağlantı bilgilerini sil" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1470 +#: ../../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 "Kişisel verileri silin" +msgstr "Kişisel verileri sil" -#: ../../locales/../src/interface/quickconnectbar.cpp:146 +#: ../../locales/../src/interface/quickconnectbar.cpp:149 msgid "Clear quickconnect bar" -msgstr "Hızlı bağlantı çubuğunu temizleyin" +msgstr "Hızlı bağlantı çubuğunu temizle" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:580 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:2037 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2062 msgid "Client to server MAC:" msgstr "İstemciden sunucunun MAC adresine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2027 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2052 msgid "Client to server cipher:" msgstr "İstemciden sunucuya şifre:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:614 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:618 msgid "Close &all other tabs" -msgstr "Diğer tüm sekmeleri k&apatın" +msgstr "Diğer tüm sekmeleri k&apat" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" -msgstr "FileZilla yazılımını kapatın" +msgstr "FileZilla yazılımını kapat" #: ../../locales/../src/interface/cmdline.cpp:15 msgid "Close all running instances of FileZilla" -msgstr "Çalışan tüm FileZilla kopyalarını kapatın" +msgstr "Çalışan tüm FileZilla kopyalarını kapat" #: ../../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:223 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:264 msgid "Co&mments:" msgstr "No&tlar:" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 msgid "Column properties" msgstr "Sütun özellikleri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2096 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2121 msgid "Column setup" msgstr "Sütun ayarları" -#: ../../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 "Komut ve parametreler doğru şekilde yazılmalı." +msgstr "Komut ve parametreleri doğru şekilde tırnak içinde yazmalısınız." -#: ../../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 "Komut yürütülemedi" -#: ../../locales/../src/engine/proxy.cpp:504 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Komut desteklenmiyor" -#: ../../locales/../src/engine/engineprivate.cpp:199 +#: ../../locales/../src/engine/engineprivate.cpp:212 msgid "Command not supported by this protocol" msgstr "Bu iletişim kuralı bu komutu desteklemiyor" -#: ../../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:283 +#: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" msgstr "Komut:" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:34 msgid "Comment" msgstr "Not" -#: ../../locales/../src/interface/verifycertdialog.cpp:185 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Common name:" -msgstr "Genel ad:" +msgstr "Bilinen Ad:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 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:531 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:535 msgid "Compare &modification time" msgstr "Son 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:527 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:531 msgid "Compare file&size" msgstr "Do&sya boyutları karşılaştırılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1765 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1784 msgid "Comparison &threshold (in minutes):" msgstr "Karşılaş&tırma eşiği (dakika cinsinden):" @@ -2200,14 +2223,14 @@ msgid "Compressed" msgstr "Sıkıştırılmış" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:813 msgid "Concurrent transfers" -msgstr "Eşzamanlı aktarım" +msgstr "Eşzamanlı Aktarım" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1300 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3026 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1315 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3063 msgid "Conditions are c&ase sensitive" -msgstr "Kısıtlar büyük küçük h&arfe duyarlıdır" +msgstr "Ölçütler büyük küçük h&arfe duyarlı" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:341 msgid "Configuration test" @@ -2221,36 +2244,41 @@ msgid "Configure port range" msgstr "Kapı aralığını ayarlayın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3342 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Filezilla ve ağınızın ayarları" -#: ../../locales/../src/interface/search.cpp:784 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Silme işlemini onaylayın" -#: ../../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: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 "Onay gerekiyor" -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:576 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:145 +#: ../../locales/../src/interface/quickconnectbar.cpp:148 msgid "Connect bypassing proxy settings" msgstr "Vekil sunucu ayarları atlanarak bağlanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1364 +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Bağlantı kurulamadı: %s" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Geçerli sekmede bağlansın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1363 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1382 msgid "Connect in new tab" msgstr "Yeni sekmede bağlansın" @@ -2258,28 +2286,25 @@ msgid "Connect to specified Site Manager site" msgstr "Site Yöneticisinde belirtilen siteye bağlanılsın" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:911 -msgid "Connected" -msgstr "Bağlandı" - -#: ../../locales/../src/interface/queue.cpp:384 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Bağlanıyor" -#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "%s sunucusuna bağlanılıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1030 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format -msgid "Connecting to %s through proxy" -msgstr "%s sunucusuna vekil sunucu ile bağlanılıyor" +msgid "Connecting to %s through %s proxy" +msgstr "%s bağlantısı %s vekil sunucusu üzerinden yapılıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:906 -#: ../../locales/../src/engine/proxy.cpp:198 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:366 +#: ../../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 "%s bağlantısı kuruluyor..." @@ -2288,173 +2313,184 @@ msgid "Connection" msgstr "Bağlantı" -#: ../../locales/../src/engine/socket.cpp:1163 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Bağlantıdan vazgeçildi" -#: ../../locales/../src/interface/queue.cpp:385 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Bağlantı kurulamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:911 -#: ../../locales/../src/engine/proxy.cpp:203 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:915 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "\"%s\" ile bağlantı kurulamadı." -#: ../../locales/../src/engine/ControlSocket.cpp:184 -#: ../../locales/../src/engine/engineprivate.cpp:678 +#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/engineprivate.cpp:681 msgid "Connection attempt interrupted by user" msgstr "Bağlantı denemesi kullanıcı tarafından kesildi" -#: ../../locales/../src/engine/socket.cpp:1156 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Bağlanma denemesi zaman aşımına uğradı" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Bağlantı kapandı" -#: ../../locales/../src/engine/ControlSocket.cpp:997 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:232 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Bağlantı sunucu tarafından kapatıldı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:369 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:296 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 msgid "Connection established, initializing TLS..." msgstr "Bağlanıldı, TLS yükleniyor..." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:321 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 msgid "Connection established, sending HTTP request" msgstr "Bağlanıldı, HTTP isteği gönderiliyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:397 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +msgid "Connection established, waiting for welcome message." +msgstr "Bağlantı kuruldu, hoşgeldiniz iletisi bekleniyor." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "Bağlanıldı, hoş geldin iletisi bekleniyor..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Bağlantı koptu" -#: ../../locales/../src/engine/proxy.cpp:489 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "Kural seti bağlantıya izin vermedi" -#: ../../locales/../src/engine/proxy.cpp:498 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Bağlantı reddedildi" -#: ../../locales/../src/engine/socket.cpp:1150 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Bağlantı sunucu tarafından reddedildi" -#: ../../locales/../src/engine/socket.cpp:1159 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Bağlantı ağ tarafından sıfırlandı" -#: ../../locales/../src/engine/socket.cpp:1164 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "Bağlantı diğer uç tarafndan sıfırlandı" -#: ../../locales/../src/engine/ControlSocket.cpp:564 -msgid "Connection timed out" -msgstr "Bağlantı zaman aşımına uğradı" +#: ../../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] "%d saniye boyunca işlem yapılmadığından bağlantı kesildi" -#: ../../locales/../src/interface/netconfwizard.cpp:1083 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Bağlantı zaman aşımına uğradı." -#: ../../locales/../src/interface/search.cpp:370 +#: ../../locales/../src/interface/search.cpp:386 msgid "Connection to server lost." msgstr "Sunucuyla bağlantı kesildi." -#: ../../locales/../src/engine/proxy.cpp:213 +#: ../../locales/../src/engine/proxy.cpp:249 msgid "Connection with proxy established, performing handshake..." msgstr "Vekil sunucu ile bağlantı sağlandı, iletişim kuruluyor..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "Sunucuyla bağlantı vaktinden önce kapandı." -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "Sınama sunucusuyla bağlantı kurulamadı." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273 -msgid "Convert keyfile" -msgstr "Anahtar dosyası dönüştürülsün" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 +msgid "Convert key file" +msgstr "Anahtar dosyasını dönüştür" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:644 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1745 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:625 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 #, c-format msgid "Copy (%d) of %s" msgstr "%d / (%s) kopya" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:621 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1725 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:605 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, c-format msgid "Copy of %s" msgstr "%s kopyası" #: ../../locales/../src/interface/resources/xrc/menus.xrc:329 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:512 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:516 msgid "Copy the URLs of the selected items to clipboard." msgstr "Seçili ögelerin İnternet adreslerini panoya kopyalar." -#: ../../locales/../src/engine/transfersocket.cpp:206 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "%s bağlantısı kabul edilemedi" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:100 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:544 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:96 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:529 msgid "Could not add connection to Site Manager" msgstr "Bağlantı Site Yöneticisine eklenemedi" -#: ../../locales/../src/interface/state.cpp:823 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "İşlem tamamlanamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Sunucuyla bağlantı kurulamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1067 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "%s sunucusuyla bağlantı kurulamadı" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:765 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 msgid "Could not convert command to server encoding" msgstr "Komut, sunucu kodlamasına dönüştürülemedi" -#: ../../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 "Kişisel anahtar dönüştürülemedi" -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not copy URLs" msgstr "İnternet adresleri kopyalanamadı" -#: ../../locales/../src/interface/aboutdialog.cpp:175 +#: ../../locales/../src/interface/aboutdialog.cpp:198 msgid "Could not copy data" msgstr "Veri kopyalanamadı" -#: ../../locales/../src/interface/updater.cpp:453 +#: ../../locales/../src/interface/updater.cpp:459 #, c-format msgid "Could not create local file %s\n" msgstr "%s yerel dosyası oluşturulamıyor\n" -#: ../../locales/../src/interface/RemoteListView.cpp:2273 -#: ../../locales/../src/interface/RemoteTreeView.cpp:912 +#: ../../locales/../src/engine/logging.cpp:173 +#, 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 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 " @@ -2464,11 +2500,11 @@ "Ya kabuk eklentileri yüklü değil ya da dosyaları bir Gezgin penceresine " "sürüklemediniz." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4181 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 msgid "Could not establish connection to server" msgstr "Sunucu ile bağlantı kurulamadı" -#: ../../locales/../src/interface/FileZilla.cpp:485 +#: ../../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 " @@ -2483,38 +2519,43 @@ msgid "Could not generate custom login sequence." msgstr "Özel oturum açma sıralaması üretilemedi." -#: ../../locales/../src/engine/tlssocket.cpp:944 +#: ../../locales/../src/engine/tlssocket.cpp:958 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:921 +#: ../../locales/../src/engine/tlssocket.cpp:935 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:976 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Uzaktaki yolun tamamı okunamadı." -#: ../../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 yanıt vermiyor." -#: ../../locales/../src/interface/edithandler.cpp:1617 -#: ../../locales/../src/interface/search.cpp:724 +#: ../../locales/../src/interface/edithandler.cpp:1574 +#: ../../locales/../src/interface/search.cpp:696 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:867 +#: ../../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/engine/tlssocket.cpp:862 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2522,8 +2563,8 @@ "Denklik sertifikaları için yapı oluşturulamadı, gnutls_x509_crt_init " "başarısız" -#: ../../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 " @@ -2534,15 +2575,15 @@ "olun.\n" "Site Yöneticisi'nde yapılan değişiklikler kaydedilmeyecek." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223 -msgid "Could not load keyfile" -msgstr "Anahtar dosya yüklenemedi" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:59 +msgid "Could not load key file" +msgstr "Anahtar dosyası yüklenemedi" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Kişisel anahtar yüklenemedi" -#: ../../locales/../src/interface/state.cpp:1002 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2552,7 +2593,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:391 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2562,7 +2603,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:292 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2572,64 +2613,72 @@ "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:175 -#: ../../locales/../src/interface/RemoteListView.cpp:2625 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1464 +#: ../../locales/../src/interface/aboutdialog.cpp:198 +#: ../../locales/../src/interface/RemoteListView.cpp:2522 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1381 msgid "Could not open clipboard" msgstr "Pano açılamadı" -#: ../../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 "%s adındaki günlük dosyası açılamıyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:70 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:69 msgid "Could not parse remote path." msgstr "Uzaktaki yola gidilemedi." #: ../../locales/../src/interface/quickconnectbar.cpp:82 msgid "Could not parse server address:" -msgstr "Sunucu adresi çözülemedi:" +msgstr "Sunucu adresi çözümlenemedi:" + +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Soketten veri okunamadı." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Soketten okunamadı: %s" -#: ../../locales/../src/interface/sitemanager.cpp:488 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Sunucu nesnesi okunamıyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +msgid "Could not receive data from server." +msgstr "Sunucudan veri alınamadı." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2596 #, 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:2571 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 msgid "Could not seek to the end of the file" msgstr "Dosyanın sonuna ulaşılamıyor" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:136 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Komut fzputtygen üzerine gönderilemedi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2687 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "GÇ işlemi başlatılamıyor:" -#: ../../locales/../src/engine/ControlSocket.cpp:1044 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Vekil sunucu ile iletişim kurulamadı: %s" -#: ../../locales/../src/interface/queue.cpp:390 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Aktarım işlemi başlatılamadı" -#: ../../locales/../src/interface/sitemanager.cpp:656 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:813 +#: ../../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: " @@ -2638,17 +2687,17 @@ "\"%s\" dosyasına yazılamıyor, Site Yöneticisi'nde yapılan değişiklikler " "kaydedilemeyecek: %s" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:841 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:812 #, 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:323 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:317 #, 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" -#: ../../locales/../src/interface/QueueView.cpp:1896 +#: ../../locales/../src/interface/QueueView.cpp:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2657,64 +2706,66 @@ "\"%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.cpp:828 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2141 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2226 #, 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" -#: ../../locales/../src/interface/xmlfunctions.cpp:124 +#: ../../locales/../src/interface/xmlfunctions.cpp:146 #, c-format msgid "Could not write \"%s\":" msgstr "\"%s\" yazılamıyor:" -#: ../../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 "%s anahtar dosyasına yazılamadı" +msgid "Could not write key file: %s" +msgstr "Anahtar dosyası yazılamadı: %s" -#: ../../locales/../src/interface/queue.cpp:389 +#: ../../locales/../src/interface/queue.cpp:337 msgid "Could not write to local file" msgstr "Yerel dosyaya yazılamıyor" -#: ../../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 "%s günlük dosyasına yazılamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:875 -#: ../../locales/../src/engine/ControlSocket.cpp:966 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "%s soketine yazılamıyor" -#: ../../locales/../src/interface/verifycertdialog.cpp:190 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Ülke:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:438 -msgid "Crashes FileZilla instantly. Only used to debug the exception handler" -msgstr "" -"FileZilla'yı hemen çökertir. Yalnız istisna yakalayıcı ile hata ayıklamak " -"için kullanılır" - #: ../../locales/../src/interface/resources/xrc/menus.xrc:312 msgid "Crea&te new file" -msgstr "&Dosya oluşturun" +msgstr "&Dosya oluştur" + +#: ../../locales/../src/interface/state.cpp:959 +msgid "Create &missing local directory and enter it" +msgstr "&Eksik yerel klasörü oluştur ve aç" + +#: ../../locales/../src/interface/state.cpp:886 +msgid "Create &missing remote directory and enter it" +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:495 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:559 +#: ../../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 "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:499 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:563 +#: ../../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 "Geçerli klasörde yeni bir alt klasör oluşturup içine geçin" @@ -2724,50 +2775,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:502 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:566 msgid "Create director&y and enter it" -msgstr "Kla&sör oluşturun ve açın" +msgstr "Kla&sör oluştur ve aç" -#: ../../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:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteListView.cpp:1293 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Create directory" -msgstr "Klasör oluşturun" +msgstr "Klasör oluştur" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" -msgstr "Boş dosya oluşturun" +msgstr "Boş dosya oluştur" -#: ../../locales/../src/interface/queue.cpp:392 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Klasör oluşturuluyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3240 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1943 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "'%s' klasörü oluşturuluyor..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Kritik hata" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Kritik hata:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Kritik dosya aktarım hatası" -#: ../../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 "Aktarımın %s/%s kadarı iletildikten sonra kritik dosya aktarım hatası" -#: ../../locales/../src/interface/state.cpp:382 +#: ../../locales/../src/interface/state.cpp:353 #, c-format msgid "" "Current remote directory (%s) is not below the synchronization root (%s).\n" @@ -2776,81 +2827,89 @@ "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:388 +#: ../../locales/../src/interface/statusbar.cpp:393 msgid "Current transfer type is set to ASCII." msgstr "Geçerli aktarım tipi ASCII olarak ayarlandı." -#: ../../locales/../src/interface/statusbar.cpp:398 +#: ../../locales/../src/interface/statusbar.cpp:401 msgid "Current transfer type is set to automatic detection." msgstr "Geçerli aktarım tipi otomatik algılanacak şekilde ayarlandı." -#: ../../locales/../src/interface/statusbar.cpp:393 +#: ../../locales/../src/interface/statusbar.cpp:397 msgid "Current transfer type is set to binary." msgstr "Geçerli aktarım tipi ikili olarak ayarlandı." +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2006 +msgid "Curve:" +msgstr "Eğri:" + #: ../../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 "İsteğe Gö&re Uyarlanmış" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Özel süzme seti" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2374 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2388 msgid "Custom server" msgstr "Özel sunucu" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2508 msgid "D&ata type" msgstr "V&eri tipi" -#: ../../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 "Ondalık ön&ekleri kullanan SI sembolleri (örnek: 1 KB = 1000 bayt)" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:392 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:441 msgid "D&efault" msgstr "V&arsayılan" #: ../../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:507 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:606 msgid "D&elete" -msgstr "S&ilin" +msgstr "S&il" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "&Klasör karşılaştırma" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1084 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" -msgstr "Tü&münü devre dışı bırakın" +msgstr "Tü&münü devre dışı bırak" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1332 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1351 msgid "D&o not save passwords" msgstr "Par&olalar kaydedilmesin" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1813 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1832 msgid "D&ouble-click action on directories:" msgstr "Klasörlerlere çift &tıklayınca ne olsun:" -#: ../../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:2842 msgid "D&uplicate" -msgstr "K&opyalayın" +msgstr "K&opyala" #: ../../locales/../src/engine/server.cpp:34 msgid "DOS-like with virtual paths" msgstr "DOS benzeri sanal yollar" -#: ../../locales/../src/interface/edithandler.cpp:1669 +#: ../../locales/../src/interface/edithandler.cpp:1626 msgid "Dangerous filetype" msgstr "Tehlikeli dosya tipi" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41 +#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:35 msgid "Data" msgstr "Veri" -#: ../../locales/../src/interface/netconfwizard.cpp:1000 -#: ../../locales/../src/interface/netconfwizard.cpp:1064 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Veri soketi çok erken kapandı." @@ -2858,9 +2917,9 @@ msgid "Date" msgstr "Tarih" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1471 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1490 msgid "Date formatting" -msgstr "Tarih biçimi" +msgstr "Tarih Biçimi" #: ../../locales/../src/interface/settings/settingsdialog.cpp:104 msgid "Date/time format" @@ -2872,13 +2931,13 @@ #: ../../locales/../src/interface/settings/settingsdialog.cpp:116 msgid "Debug" -msgstr "Hata ayıklama" +msgstr "Hata Ayıklama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2197 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2216 msgid "Debugging settings" -msgstr "Hata ayıklama ayarları" +msgstr "Hata Ayıklama Ayarları" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:279 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:321 msgid "Default &local directory:" msgstr "Varsayılan yere&l klasör:" @@ -2890,17 +2949,17 @@ msgid "Default editor not properly quoted." msgstr "Varsayılan düzenleyici düzgün yazılmamış." -#: ../../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:1377 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1447 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1226 msgid "Default file exists action" -msgstr "Varsayılan dosya var işlemi" +msgstr "Varsayılan Dosya Var İşlemi" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:304 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:346 msgid "Default r&emote directory:" msgstr "Varsayılan &uzak klasör:" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1056 +#: ../../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." @@ -2914,11 +2973,11 @@ #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:68 msgid "Default transfer mode:" -msgstr "Varsayılan aktarım kipi:" +msgstr "Varsayılan Aktarım Kipi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1050 msgid "Default transfer type:" -msgstr "Varsayılan aktarım tipi:" +msgstr "Varsayılan Aktarım Tipi:" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:233 #: ../../locales/../src/interface/resources/xrc/settings.xrc:380 @@ -2932,7 +2991,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:519 +#: ../../locales/../src/engine/engineprivate.cpp:522 #, c-format msgid "" "Delaying connection for %d second due to previously failed connection " @@ -2944,61 +3003,57 @@ "Bir önceki bağlantının kurulamaması nedeniyle bağlantı %d saniye " "bekletiliyor..." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1200 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1231 msgid "Delete Site Manager entry" -msgstr "Site Yöneticisi kaydını silin" +msgstr "Site Yöneticisi kaydını sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:504 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:568 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:508 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:572 msgid "Delete selected directory" -msgstr "Seçili klasörü silin" +msgstr "Seçili klasörü sil" #: ../../locales/../src/interface/resources/xrc/menus.xrc:277 #: ../../locales/../src/interface/resources/xrc/menus.xrc:321 msgid "Delete selected files and directories" -msgstr "Seçili dosya ve klasörleri silin" +msgstr "Seçili dosya ve klasörleri sil" -#: ../../locales/../src/engine/engineprivate.cpp:361 +#: ../../locales/../src/engine/engineprivate.cpp:365 #, c-format msgid "Deleting \"%s\"" msgstr "\"%s\" siliniyor" -#: ../../locales/../src/engine/engineprivate.cpp:364 +#: ../../locales/../src/engine/engineprivate.cpp:368 #, c-format msgid "Deleting %u files from \"%s\"" msgstr "%u dosya \"%s\" üzerinden siliniyor" -#: ../../locales/../src/interface/search.cpp:768 -msgid "Deleting directories" -msgstr "Klasörler siliniyor" - -#: ../../locales/../src/interface/search.cpp:768 -msgid "Deleting multiple unrelated directories is not yet supported" -msgstr "Birden fazla bağlantısız klasörü silme işlemi henüz desteklenmiyor" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3174 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Sembolik bağlantı siliniyor" -#: ../../locales/../src/interface/LocalTreeView.cpp:1009 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Masaüstü" #: ../../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 "Ayrıntılar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:946 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:962 msgid "Details for new key:" msgstr "Yeni anahtarın ayrıntıları:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1319 +#: ../../locales/../src/interface/import.cpp:58 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:758 +msgid "Detected newer version of FileZilla" +msgstr "Yeni bir FileZilla sürümü yayınlanmış" + +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1334 msgid "Dire&ctories" msgstr "K&lasörler" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Yön" @@ -3006,17 +3061,17 @@ msgid "Directory" msgstr "Klasör" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:520 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1751 +#: ../../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:459 -#: ../../locales/../src/interface/Mainfrm.cpp:2242 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" -msgstr "Klasör karşılaştırma" +msgstr "Klasör Karşılaştırma" -#: ../../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 "Klasörler karşılaştırılamadı" @@ -3024,37 +3079,37 @@ 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:190 +#: ../../locales/../src/engine/ControlSocket.cpp:191 msgid "Directory listing aborted by user" msgstr "Kullanıcı klasör listelemeyi durdurdu" -#: ../../locales/../src/interface/RemoteListView.cpp:2075 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Klasör listelenemedi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1019 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1035 msgid "Directory listing filters" msgstr "Klasör listeleme süzgeçleri" -#: ../../locales/../src/engine/ControlSocket.cpp:198 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "\"%s\" klasörleri listelendi" -#: ../../locales/../src/engine/ControlSocket.cpp:195 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Klasör listelendi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1119 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1135 msgid "Disa&ble all" -msgstr "Tümünü &devre dışı bırakın" +msgstr "Tümünü &devre dışı bırak" -#: ../../locales/../src/interface/state.cpp:1010 +#: ../../locales/../src/interface/state.cpp:952 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:676 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3063,38 +3118,38 @@ #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:57 msgid "Disconnect from server" -msgstr "Sunucu ile bağlantıyı kesin" +msgstr "Sunucu ile bağlantıyı kes" -#: ../../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: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 "Sunucu ile bağlantı kesildi" -#: ../../locales/../src/engine/ControlSocket.cpp:999 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:911 +#: ../../locales/../src/engine/ControlSocket.cpp:1020 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:898 #, c-format msgid "Disconnected from server: %s" msgstr "%s sunucusu ile bağlantı kesildi" -#: ../../locales/../src/interface/queue.cpp:382 +#: ../../locales/../src/interface/queue.cpp:330 #: ../../locales/../src/interface/statuslinectrl.cpp:237 msgid "Disconnecting from previous server" msgstr "Önceki sunucu ile bağlantı kesiliyor" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:58 msgid "Disconnects from the currently visible server" -msgstr "Geçerli görünen sunucu bağlantısını kesin" +msgstr "Görüntüdeki sunucu bağlantısını keser" #: ../../locales/../src/interface/resources/xrc/menus.xrc:234 msgid "Display about dialog" msgstr "Hakkında penceresini görüntüler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1886 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1905 msgid "Do ¬ use default editor" msgstr "Varsayılan düzenleyici kulla&nılmasın" @@ -3102,13 +3157,13 @@ msgid "Do ¬hing" msgstr "&Hiç bir şey yapılmasın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1801 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1856 +#: ../../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 "Düzenlenen &tüm dosyalar için aynı işlem uygulansın" -#: ../../locales/../src/interface/Mainfrm.cpp:1179 -#: ../../locales/../src/interface/Mainfrm.cpp:1201 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "FileZilla kapatılsın mı?" @@ -3123,7 +3178,7 @@ 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:1202 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1233 msgid "Do you really want to delete selected entry?" msgstr "Seçili kayıdı silmek istiyor musunuz?" @@ -3131,16 +3186,16 @@ 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:612 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, 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:1849 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1864 msgid "Do you want to reopen this file?" msgstr "Bu dosyayı yeniden açmak ister misiniz?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Belgeler" @@ -3148,47 +3203,47 @@ 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:1128 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1147 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess" msgstr "Noktalı dosyalar, .htaccess gibi adı nokta ile başlayan dosyalardır" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1789 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1808 msgid "Double-click action" -msgstr "Çift tıklama eylemleri" +msgstr "Çift Tıklama Eylemleri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2192 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2217 msgid "Download" msgstr "İndirme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3526 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:886 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3563 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:905 msgid "Download &limit:" msgstr "Karşıdan indirme &sınırı:" -#: ../../locales/../src/interface/statusbar.cpp:579 +#: ../../locales/../src/interface/statusbar.cpp:581 #, c-format msgid "Download limit: %s/s" msgstr "İndirme sınırı: %s/s." -#: ../../locales/../src/interface/statusbar.cpp:581 +#: ../../locales/../src/interface/statusbar.cpp:583 msgid "Download limit: none" msgstr "İndirme sınırı: yok" -#: ../../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:3110 +#: ../../locales/../src/interface/search.cpp:524 +#: ../../locales/../src/interface/search.cpp:529 msgid "Download search results" -msgstr "Arama sonuçlarını indirin" +msgstr "Arama sonuçlarını indir" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:485 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:489 msgid "Download selected directory" -msgstr "Seçili klasörü indirin" +msgstr "Seçili klasörü indir" #: ../../locales/../src/interface/resources/xrc/menus.xrc:288 msgid "Download selected files and directories" -msgstr "Seçili dosya ve klasörleri indirin" +msgstr "Seçili dosya ve klasörleri indir" -#: ../../locales/../src/interface/Mainfrm.cpp:1007 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3197,58 +3252,50 @@ "İndirme hızı: %s/s\n" "Yükleme hızı: %s/s" -#: ../../locales/../src/interface/edithandler.cpp:1116 +#: ../../locales/../src/interface/edithandler.cpp:1099 msgid "Downloading" msgstr "İndiriliyor" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:339 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "%s indiriliyor" -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Birden fazla bağlantısız klasörü indirme işlemi henüz desteklenmiyor" - -#: ../../locales/../src/interface/search.cpp:619 -msgid "Downloading search results" -msgstr "Arama sonuçları indiriliyor" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Güncelleme indiriliyor..." -#: ../../locales/../src/interface/LocalListView.cpp:103 -#: ../../locales/../src/interface/LocalTreeView.cpp:107 -#: ../../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:87 +#: ../../locales/../src/interface/RemoteTreeView.cpp:89 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:109 -#: ../../locales/../src/interface/LocalTreeView.cpp:113 -#: ../../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:93 +#: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." msgstr "Farklı sunucular arasında Sürükle Bırak henüz desteklenmiyor." #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:65 msgid "Dupl&icate" -msgstr "Kopya&layın" +msgstr "Kopya&la" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1077 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1093 msgid "E&nable all" -msgstr "Tümü&nü etkinleştirin" +msgstr "Tümü&nü etkinleştir" #: ../../locales/../src/interface/resources/xrc/menus.xrc:250 #: ../../locales/../src/interface/resources/xrc/menus.xrc:296 msgid "E&nter directory" -msgstr "K&lasöre geçin" +msgstr "K&lasörü aç" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:455 msgid "E&xecute" @@ -3256,19 +3303,25 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:39 msgid "E&xit" -msgstr "FileZilla yazılımını &kapatın" +msgstr "FileZilla yazılımını &kapat" -#: ../../locales/../src/interface/verifycertdialog.cpp:196 +#: ../../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 "Bilgileri &Ver..." + +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "E-posta:" -#: ../../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 "Her süzgeç en az bir kısıta sahip olmalı." +msgstr "Her süzgeç en az bir ölçüte sahip olmalı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1358 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1373 msgid "Edit filters" -msgstr "Süzgeçleri düzenleyin" +msgstr "Süzgeçleri düzenle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:260 msgid "" @@ -3277,24 +3330,24 @@ "Dosya ayarlanmış olan düzenleyici ile düzenlensin ve değişiklikler sunucuya " "yüklensin." -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Klasörleri düzenleme işlemi desteklenmiyor" -#: ../../locales/../src/interface/LocalListView.cpp:1602 -#: ../../locales/../src/interface/LocalListView.cpp:1611 +#: ../../locales/../src/interface/LocalListView.cpp:1587 +#: ../../locales/../src/interface/LocalListView.cpp:1596 msgid "Editing failed" msgstr "Düzenleme yapılamadı" -#: ../../locales/../src/interface/search.cpp:710 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Arama sonuçları düzenleniyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1432 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1451 msgid "Email:" msgstr "E-posta:" -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Boş komut" @@ -3302,11 +3355,11 @@ msgid "Empty command." msgstr "Boş komut." -#: ../../locales/../src/interface/RemoteListView.cpp:2077 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Klasör listesi boş" -#: ../../locales/../src/interface/filelist_statusbar.cpp:26 +#: ../../locales/../src/interface/filelist_statusbar.cpp:14 msgid "Empty directory." msgstr "Klasör boş." @@ -3328,11 +3381,11 @@ msgid "Empty quoted string." msgstr "Boş ifade." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1112 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1128 msgid "En&able all" -msgstr "&Tümünü etkinleştirin" +msgstr "&Tümünü etkinleştir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:967 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:986 msgid "Enable invalid character &filtering" msgstr "Geçersiz karakterler &süzülsün" @@ -3340,49 +3393,49 @@ msgid "Encrypted" msgstr "Şifreli" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2045 msgid "Encryption" msgstr "Şifreleme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1966 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1981 msgid "Encryption details" msgstr "Şifreleme ayrıntıları" -#: ../../locales/../src/interface/filelistctrl.cpp:461 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" -msgstr "Karşılaştırma bitirilip sıralama düzenini değiştirilsin mi?" +msgstr "Karşılaştırma bitirilip sıralama düzeni değiştirilsin mi?" #: ../../locales/../src/interface/resources/xrc/menus.xrc:195 msgid "Enter &custom command..." msgstr "Özel &komut yazın..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Sınırsız hız için 0 yazın." -#: ../../locales/../src/interface/QueueView.cpp:2170 +#: ../../locales/../src/interface/QueueView.cpp:2103 msgid "Enter command" msgstr "Komutu yazın" -#: ../../locales/../src/interface/Mainfrm.cpp:595 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Özel komutu yazın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1822 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1841 msgid "Enter directory" -msgstr "Klasöre geçilsin" +msgstr "Klasör açılsın" #: ../../locales/../src/interface/filteredit.cpp:136 #: ../../locales/../src/interface/filteredit.cpp:196 #: ../../locales/../src/interface/filteredit.cpp:243 msgid "Enter filter name" -msgstr "Süzgeç adı yazın" +msgstr "Süzgeç adını yazın" -#: ../../locales/../src/interface/filter.cpp:335 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Süzmeseti için bir ad yazın" -#: ../../locales/../src/interface/filter.cpp:393 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Süzme seti için ad yazın" @@ -3393,7 +3446,7 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:251 #: ../../locales/../src/interface/resources/xrc/menus.xrc:297 msgid "Enter selected directory" -msgstr "Seçili klasöre geçin" +msgstr "Seçili klasörü aç" #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:34 msgid "" @@ -3424,14 +3477,14 @@ "- ftps:// TLS (örtülü) üzerinden FTP için\n" "- ftpes:// TLS (açıkta) üzerinden 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' dosyası için parolayı yazın.\n" -"Lütfen dikkat: Dönüştürülecek dosya parola korumalı olmayacak." +"Dönüştürülen dosya aynı parola ile korunacak." #: ../../locales/../src/interface/resources/xrc/quickconnectbar.xrc:82 msgid "" @@ -3441,7 +3494,7 @@ "Sunucunun dinlediği kapıyı yazın.\n" "Varsayılan kapılar FTP için 21, SFTP için 22'dir." -#: ../../locales/../src/interface/loginmanager.cpp:61 +#: ../../locales/../src/interface/loginmanager.cpp:65 msgid "Enter username and password" msgstr "Kullanıcı adı ve parolayı yazın" @@ -3450,71 +3503,71 @@ msgstr "Ayarlar verilirken hata oluştu" #: ../../locales/../src/interface/import.cpp:28 -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:95 msgid "Error importing" msgstr "Alırken hata oluştu" -#: ../../locales/../src/interface/QueueView.cpp:1963 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Kuyruk yüklenirken hata oluştu" -#: ../../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/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: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/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: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/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 "XML dosyası okunurken hata oluştu" -#: ../../locales/../src/interface/QueueView.cpp:1868 +#: ../../locales/../src/interface/QueueView.cpp:1813 msgid "Error saving queue" msgstr "Kuyruk kaydedilirken hata oluştu" -#: ../../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 "Yazılım başlatılırken hata oluştu" -#: ../../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/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.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/sitemanager_dialog.cpp:830 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 +#: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "XML dosyası yazılırken hata oluştu" -#: ../../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:281 +#: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" msgstr "Hata:" -#: ../../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 "Örnek: 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 "Örnekler" @@ -3528,23 +3581,23 @@ "Kullandığınız uygulama sürüm bilgisini içermediğinden güncelleme denetimi " "yapılamıyor." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1267 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1286 msgid "Explorer" msgstr "Gezgin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1567 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1582 msgid "Export &Queue" -msgstr "&Aktarım kuyruğunu verin" +msgstr "&Aktarım kuyruğu verilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1562 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1577 msgid "Export &Settings" -msgstr "Ayarları &Verin" +msgstr "Ayarlar &verilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1543 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1558 msgid "Export settings" msgstr "Ayarları verin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1269 msgid "F&ilter name:" msgstr "Sü&zgeç adı:" @@ -3552,7 +3605,7 @@ msgid "FTP" msgstr "FTP" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:513 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:524 msgid "FTP - File Transfer Protocol" msgstr "FTP - Dosya aktarımı iletişim kuralı" @@ -3565,7 +3618,7 @@ msgstr "FTP - Güvenliksiz dosya aktarımı iletişim kuralı" #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FTP Engine not initialized, can't connect" msgstr "FTP motoru başlatılamadı, bağlanamıyor" @@ -3598,53 +3651,53 @@ msgid "FTPS - FTP over implicit TLS" msgstr "FTPS - FTP üzerinden örtülü 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: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 "Klasör değiştirilemedi" -#: ../../locales/../src/interface/FileZilla.cpp:199 -#: ../../locales/../src/interface/FileZilla.cpp:212 -#: ../../locales/../src/interface/FileZilla.cpp:214 +#: ../../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 "Dil değiştirilemedi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1933 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Siteler kopyalanamadı ya da taşınamadı" -#: ../../locales/../src/interface/xmlfunctions.cpp:463 +#: ../../locales/../src/interface/xmlfunctions.cpp:350 msgid "Failed to create backup copy of xml file" msgstr "Xml dosyasının yedeği alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:809 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Dinleme soketi oluşturulamadı, iptal ediliyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4160 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:632 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 msgid "Failed to get 'My Documents' path" msgstr "'Belgelerim' klasörüne erişilemedi" -#: ../../locales/../src/interface/LocalTreeView.cpp:618 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Masaüstü yolu alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:974 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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ı." @@ -3652,80 +3705,84 @@ msgid "Failed to initialize FTP engine" msgstr "FTP motoru başlatılamadı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:377 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:756 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:303 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "TLS başlatılamadı" +#: ../../locales/../src/interface/FileZilla.cpp:109 +msgid "Failed to initialize networking" +msgstr "Ağ sistemi başlatılamadı" + #: ../../locales/../src/interface/settings/settingsdialog.cpp:146 msgid "Failed to load panels, invalid resource files?" msgstr "Paneller yüklenemedi, kaynak dosyalar bozuk mu?" -#: ../../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 "Kişisel anahtar yüklenemedi: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2561 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "\"%s\" ekleme/yazma için açılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, c-format msgid "Failed to open \"%s\" for reading" msgstr "\"%s\" okuma için açılamıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2593 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1023 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "\"%s\" yazma için açılamıyor" -#: ../../locales/../src/engine/ControlSocket.cpp:345 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "Döndürülen yol çözümlenemedi." -#: ../../locales/../src/interface/netconfwizard.cpp:1029 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Veri alınamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "Klasör listesi alınamadı" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../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:3871 +#: ../../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:3892 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Yerel IP adresi okunamadı." -#: ../../locales/../src/interface/netconfwizard.cpp:704 +#: ../../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:632 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Dış IP adresi okunamadı." -#: ../../locales/../src/interface/netconfwizard.cpp:323 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Komut gönderilemedi." -#: ../../locales/../src/interface/FileZilla.cpp:212 +#: ../../locales/../src/interface/FileZilla.cpp:173 #, 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:192 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3733,25 +3790,25 @@ "Dil %s (%s) olarak değiştirilemedi, sistem varsayılan dili kullanılacak (%s, " "%s)." -#: ../../locales/../src/interface/FileZilla.cpp:181 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, 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:214 +#: ../../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 "Dil %s olarak değiştirilemiyor, sistem varsayılan dili kullanılacak" -#: ../../locales/../src/interface/FileZilla.cpp:188 +#: ../../locales/../src/interface/FileZilla.cpp:147 #, 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:178 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, 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." @@ -3760,16 +3817,16 @@ msgid "Failed to validate settings" msgstr "Ayarlar doğrulanamadı" -#: ../../locales/../src/engine/tlssocket.cpp:1031 +#: ../../locales/../src/engine/tlssocket.cpp:1107 msgid "Failed to verify peer certificate" msgstr "Denklik sertifikası doğrulanamadı" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:536 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "%s dosyasına yazılamadı" -#: ../../locales/../src/interface/xmlfunctions.cpp:480 +#: ../../locales/../src/interface/xmlfunctions.cpp:363 msgid "Failed to write xml file" msgstr "XML dosyasına yazılamadı" @@ -3781,11 +3838,11 @@ msgid "Fall back to active mode" msgstr "Aktif kipe geçilsin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2271 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2296 msgid "Fil&e:" msgstr "Dos&ya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1314 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1329 msgid "Fil&es" msgstr "Dos&yalar" @@ -3797,11 +3854,11 @@ msgid "File Types" msgstr "Dosya Tipleri" -#: ../../locales/../src/engine/socket.cpp:1155 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Dosya belirteci bir soket değil" -#: ../../locales/../src/interface/import.cpp:85 +#: ../../locales/../src/interface/import.cpp:95 msgid "File does not contain any importable data." msgstr "Dosyada alınabilecek bir veri yok." @@ -3809,7 +3866,7 @@ msgid "File editing" msgstr "Dosya Düzenleme" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Dosya var" @@ -3817,7 +3874,7 @@ msgid "File exists action" msgstr "Dosya Var İşlemi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1654 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1669 msgid "File has changed" msgstr "Dosya değiştirildi" @@ -3825,63 +3882,63 @@ msgid "File lists" msgstr "Dosya Listeleri" -#: ../../locales/../src/interface/edithandler.cpp:1593 -#: ../../locales/../src/interface/FileZilla.cpp:675 -#: ../../locales/../src/interface/FileZilla.cpp:760 +#: ../../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 "Dosya bulunamadı" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:87 msgid "File search" -msgstr "Dosya arayın" +msgstr "Dosya arama" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "Kullanıcı dosya aktarımını durdurdu" -#: ../../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 "Dosyanın %s/%s bölümü aktarılmışken kullanıcı işlemi durdurdu" -#: ../../locales/../src/engine/ControlSocket.cpp:136 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Dosya aktarılamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, c-format msgid "File transfer failed after transferring %s in %s" -msgstr "Dosyanın %s/%s kadarı iletildikten sonra aktarılamadı" +msgstr "Dosyanın %s/%s kadarından sonrası aktarılamadı" -#: ../../locales/../src/engine/ControlSocket.cpp:131 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Dosya aktarımı atlandı" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Dosya aktarıldı" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "Dosya aktarıldı, %s/%s kadarı aktarıldı" -#: ../../locales/../src/interface/Mainfrm.cpp:1178 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Dosya aktarımı henüz bitmedi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2502 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2527 msgid "File would transfer with ASCII data type." msgstr "Dosya ASCII veri tipiyle aktarılsa olurdu." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2507 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 msgid "File would transfer with binary data type." msgstr "Dosya ikili veri tipiyle aktarılsa olurdu." -#: ../../locales/../src/interface/FileZilla.cpp:486 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 -#: ../../locales/../src/interface/quickconnectbar.cpp:202 +#: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" msgstr "FileZilla Hatası" @@ -3892,29 +3949,29 @@ 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:3448 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 msgid "FileZilla is already connected to a server." msgstr "Filezilla şu anda bir sunucuya bağlı." -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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:2082 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2101 msgid "FileZilla updates" -msgstr "FileZilla güncellemeleri" +msgstr "FileZilla Güncellemeleri" #: ../../locales/../src/interface/resources/xrc/menus.xrc:97 msgid "Filelist status &bars" msgstr "Dosya listesi durum &çubukları" -#: ../../locales/../src/interface/edithandler.cpp:1101 +#: ../../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:374 -#: ../../locales/../src/interface/search.cpp:80 -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39 +#: ../../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 "Dosya Adı" @@ -3922,43 +3979,43 @@ msgid "Filename &filters..." msgstr "&Dosya adı süzgeçleri..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3044 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2204 +#: ../../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 "Dosya adı %s klasörü ve %s dosya adı için oluşturulamıyor" -#: ../../locales/../src/interface/RemoteListView.cpp:1616 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Dosya adı geçersiz" -#: ../../locales/../src/interface/asyncrequestqueue.cpp:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 msgid "Filename unchanged" msgstr "Dosya adı değiştirilmedi" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1671 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2114 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1686 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2133 msgid "Filename:" msgstr "Dosya Adı:" -#: ../../locales/../src/interface/file_utils.cpp:315 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Filenames may not contain any of the following characters: / * ? < > |" msgstr "Dosya adlarında şu karakterler bulunamaz: / * ? < > |" -#: ../../locales/../src/interface/file_utils.cpp:290 +#: ../../locales/../src/interface/file_utils.cpp:293 msgid "" "Filenames may not contain any of the following characters: / \\ : * ? \" < > " "|" msgstr "Dosya adlarında şu karakterler bulunamaz: / \\ : * ? \" < > |" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1962 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1977 msgid "Files currently being edited" msgstr "Şu an düzenlenen dosyalar" #: ../../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:277 +#: ../../locales/../src/interface/RemoteListView.cpp:374 +#: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" msgstr "Boyut" @@ -3966,46 +4023,46 @@ msgid "Filesize format" msgstr "Dosya Boyutu Biçimi" -#: ../../locales/../src/interface/LocalListView.cpp:276 -#: ../../locales/../src/interface/RemoteListView.cpp:376 -#: ../../locales/../src/interface/search.cpp:83 +#: ../../locales/../src/interface/LocalListView.cpp:278 +#: ../../locales/../src/interface/RemoteListView.cpp:375 +#: ../../locales/../src/interface/search.cpp:111 msgid "Filetype" msgstr "Tip" -#: ../../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 "Dosya Tipi İlişkileri" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1322 msgid "Filter applies to:" msgstr "Süzgecin uygulanacağı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:961 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:980 msgid "Filter invalid characters in filenames" -msgstr "Dosya adlarındaki geçersiz karakterler" +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:355 +#: ../../locales/../src/interface/filteredit.cpp:353 msgid "Filter name already exists" msgstr "Aynı adlı bir süzgeç var" -#: ../../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 "Şunların tümüne uyan ögeler süzülsün" -#: ../../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 "Şunların herhangi birine uyan ögeler süzülsün" -#: ../../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 "Şunların hiçbirine uymayan ögeler süzülsün" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Filter set already exists" msgstr "Aynı adlı bir süzme seti var" @@ -4013,36 +4070,34 @@ msgid "Filter the directory listings" msgstr "Klasör listesi süzülsün" -#: ../../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 "Süzgeç geçersiz" +msgstr "Süzgeç doğrulanamadı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3031 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" -msgstr "Dosya a&rayın" +msgstr "Dosyaları a&ra" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3036 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" -msgstr "&Klasör arayın" +msgstr "&Klasörleri ara" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:97 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:362 msgid "Fingerprint (SHA-1):" -msgstr "Parmak İzi (SHA-1):" +msgstr "Parmakizi (SHA-1):" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:89 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:354 msgid "Fingerprint (SHA-256):" msgstr "Parmakizi (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 "Parmak İzi:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Güvenlik duvarı ve yöneltici ayar yardımcısı" @@ -4058,7 +4113,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:235 +#: ../../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." @@ -4066,7 +4121,7 @@ "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:474 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:523 msgid "Force &UTF-8" msgstr "&UTF-8 kullanılsın" @@ -4074,26 +4129,27 @@ msgid "Force showing &hidden files" msgstr "&Gizli dosyalar görüntülensin" -#: ../../locales/../src/interface/Mainfrm.cpp:671 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Gizli dosyalar görüntülenir" #: ../../locales/../src/interface/resources/xrc/settings.xrc:493 msgid "Format specifications:" -msgstr "Biçim özellikleri:" +msgstr "Biçim Özellikleri:" -#: ../../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 "" -"Biçim: Dosya tipini izleyerek tırnak içinde komut ardından parametreler." +"Biçim: Dosya tipini izleyerek tırnak içinde komutu ve ardından 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:641 +#: ../../locales/../src/interface/updater.cpp:647 #, c-format msgid "Found new %s %s\n" msgstr "Yeni %s %s bulundu\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3348 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Ayrıntılı bilgiler" @@ -4101,11 +4157,11 @@ msgid "General" msgstr "Genel" -#: ../../locales/../src/engine/proxy.cpp:486 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Genel SOCKS sunucu hatası" -#: ../../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 "Genel Vekil Sunucu" @@ -4114,35 +4170,35 @@ msgid "Get external IP address from the following URL:" msgstr "Dış IP adresi şu İnternet adresinden alınsın:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3367 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Yardım istiyorsanız" -#: ../../locales/../src/interface/filter.cpp:355 -#: ../../locales/../src/interface/filter.cpp:411 +#: ../../locales/../src/interface/filter.cpp:354 +#: ../../locales/../src/interface/filter.cpp:410 msgid "Given filterset name already exists, overwrite filter set?" msgstr "Verilen süzme seti adı zaten var, üzerine yazılsın mıi?" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:255 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:248 msgid "Global bookmarks" msgstr "Küresel yer imleri" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS hatası %d" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS hatası %d, %s içinde" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS hatası %d, %s içinde: %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS hatası %d: %s" @@ -4163,7 +4219,7 @@ msgid "HTTPS - HTTP over TLS" msgstr "HTTPS - HTTP üzerinden TLS" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2016 msgid "Hash:" msgstr "Karma:" @@ -4171,22 +4227,22 @@ msgid "Hidden" msgstr "Gizli" -#: ../../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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Yüksek" -#: ../../locales/../src/interface/queue.cpp:892 -#: ../../locales/../src/interface/queue.cpp:979 +#: ../../locales/../src/interface/queue.cpp:913 +#: ../../locales/../src/interface/queue.cpp:1000 msgid "Highest" msgstr "En Yüksek" -#: ../../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 "En büyük kapı numarası 1024 ila 65535 arasında olmalı." -#: ../../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 "" @@ -4197,11 +4253,15 @@ msgid "Homepage:" msgstr "Giriş Sayfası:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2001 +#: ../../locales/../src/engine/socket.cpp:1062 +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:908 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:924 msgid "Host key mismatch" msgstr "Sunucu anahtarı uyuşmazlığı" @@ -4209,27 +4269,26 @@ 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:495 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Sunucuya ulaşılamıyor" -#: ../../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 "Sunucu:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:350 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:399 msgid "Hours," msgstr "Saat," -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1532 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1551 msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (örnek: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:128 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 vekil sunucuları IPv6 adreslerini desteklemez" @@ -4242,7 +4301,7 @@ "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:2246 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2265 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." @@ -4267,7 +4326,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:941 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:957 msgid "" "If the host key change was not expected, please contact the server " "administrator." @@ -4275,7 +4334,7 @@ "Sunucu anahtarının değişmesini beklemiyorsanız, sistem yöneticisi ile " "görüşün." -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4283,7 +4342,7 @@ "Bu sorun devam ederse, Filezilla bir yöneltici ya da güvenlik duvarı " "tarafından engelleniyor demektir." -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4291,7 +4350,7 @@ "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: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 " @@ -4301,7 +4360,7 @@ "\".1\" eklenerek (daha eski günlük dosyalarının üstüne yazılabilir) yeniden " "adlandırılır ve yeni bir dosya oluşturulur." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3186 +#: ../../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." @@ -4309,7 +4368,7 @@ "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:640 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4317,22 +4376,22 @@ "Bu sorun devam ederse, çözüm için yöneltici ya da güvenlik duvarı " "üreticinizle görüşün." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:591 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:1441 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1220 +#: ../../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 "" "'Daha yeni ise üstüne yazılsın' seçeneğinin kullanılabilmesi için sistem " -"saati sunucu saati ile aynı olmalı. Sistem ile sunucunun saat dilimleri " +"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: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." @@ -4341,9 +4400,11 @@ "belirtilen eşik değerini aşmıyorsa, farklı zaman damgasına sahip dosyalar " "aynı kabul edilsin." -#: ../../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 "Dili değiştirmek için FileZilla yeniden başlatılmalı." +msgstr "" +"Değiştirilen dili ayarlarının etkin olması için FileZilla yeniden " +"başlatılmalıdır." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:358 msgid "" @@ -4353,12 +4414,12 @@ "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:1200 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 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." -#: ../../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." @@ -4376,7 +4437,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:585 +#: ../../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 " @@ -4410,7 +4471,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:611 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4418,16 +4479,16 @@ "Yönelticiniz IP adresini değiştirmeye devam ediyorsa yönelticinizin " "üreticisiyle görüşün." -#: ../../locales/../src/interface/import.cpp:77 +#: ../../locales/../src/interface/import.cpp:87 msgid "Import data from older version" -msgstr "Daha eski bir sürümden veri alın" +msgstr "Önceki sürümlerden veri al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1610 msgid "Import settings" msgstr "Alma ayarları" -#: ../../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 "Veri alındı" @@ -4470,7 +4531,7 @@ "ve bağlantı verilen bu kapıdan kurulur. Bunun için pek bir ayar yapılmasına " "gerek yoktur." -#: ../../locales/../src/engine/tlssocket.cpp:1043 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4478,7 +4539,7 @@ "Kopuk zincir, üst sertifika kendiliğinden imzalanmış bir yetki sertifikası " "değil" -#: ../../locales/../src/interface/queue.cpp:380 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Parola yanlış" @@ -4490,17 +4551,21 @@ "Son FileZilla sürümüyle ilgili bilgiler alınamadı. Lütfen daha sonra yeniden " "deneyin." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:747 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "TLS başlatılıyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:731 +#: ../../locales/../src/interface/verifycertdialog.cpp:111 +msgid "Insecure algorithm!" +msgstr "Güvenliksiz algoritma!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 msgid "Insecure server, it does not support FTP over TLS." msgstr "Güvenliksiz sunucu, TLS üzerinden FTP desteklenmiyor." -#: ../../locales/../src/engine/server.cpp:834 -#: ../../locales/../src/engine/server.cpp:853 -#: ../../locales/../src/interface/manual_transfer.cpp:191 +#: ../../locales/../src/engine/server.cpp:860 +#: ../../locales/../src/engine/server.cpp:881 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Etkileşimli" @@ -4508,29 +4573,29 @@ msgid "Interface" msgstr "Arayüz" -#: ../../locales/../src/engine/socket.cpp:1152 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "İşaret tarafından kesildi" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../locales/../src/interface/queue.cpp:386 +#: ../../locales/../src/engine/ControlSocket.cpp:220 +#: ../../locales/../src/interface/queue.cpp:334 msgid "Interrupted by user" msgstr "Kullanıcı tarafından durduruldu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "İçerik-Uzunluk Geçersiz" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:592 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "HTTP Yanıtı Geçersiz" -#: ../../locales/../src/engine/socket.cpp:1140 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Geçilen argüman geçersiz" -#: ../../locales/../src/engine/ControlSocket.cpp:457 -#: ../../locales/../src/engine/ControlSocket.cpp:513 +#: ../../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." @@ -4539,23 +4604,24 @@ "karakter setini dayatmak için Site Yöneticisinde 'UTF-8 kullanılsın' " "seçeneğini etkinleştirin." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Yığın boyutu geçersiz" -#: ../../locales/../src/interface/netconfwizard.cpp:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../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 "Geçersiz veri alındı" -#: ../../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 "Tarih geçersiz" -#: ../../locales/../src/interface/file_utils.cpp:290 -#: ../../locales/../src/interface/file_utils.cpp:315 +#: ../../locales/../src/interface/file_utils.cpp:293 +#: ../../locales/../src/interface/file_utils.cpp:318 msgid "Invalid filename" msgstr "Dosya adı geçersiz" @@ -4565,7 +4631,7 @@ "Sunucu geçersiz. Parantezi kapattıktan sonra yalnızca iki nokta üstüste ve " "kapı yazılabilir." -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "Invalid input" msgstr "Giriş geçersiz" @@ -4576,7 +4642,7 @@ 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:122 +#: ../../locales/../src/interface/quickconnectbar.cpp:121 msgid "" "Invalid protocol specified. Valid protocols are:\n" "ftp:// for normal FTP with optional encryption,\n" @@ -4590,74 +4656,74 @@ "ftps:// TLS (örtülü) üzerinden FTP ve\n" "ftpes:// TLS (açıkta) üzerinde FTP." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4304 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:391 +#: ../../locales/../src/interface/search.cpp:405 msgid "Invalid regular expression in search conditions." -msgstr "Arama kısıtlarında geçersiz ifade." +msgstr "Arama ölçütlerindeki kurallı ifade geçersiz." -#: ../../locales/../src/engine/httpcontrolsocket.cpp:602 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Yanıt kodu geçersiz" -#: ../../locales/../src/interface/search.cpp:385 +#: ../../locales/../src/interface/search.cpp:400 #, c-format msgid "Invalid search conditions: %s" -msgstr "Arama kısıtları geçersiz: %s" +msgstr "Arama ölçütleri geçersiz: %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: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 "Site yolu geçersiz" -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:723 +#: ../../locales/../src/interface/filter_conditions_dialog.cpp:699 msgid "Invalid size in condition" -msgstr "Kısıttaki boyut geçersiz" +msgstr "Ölçütteki boyut geçersiz" #: ../../locales/../src/engine/server.cpp:132 msgid "Invalid username given." msgstr "Kullanıcı adı geçersiz." -#: ../../locales/../src/engine/socket.cpp:1172 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "ai_flags değeri geçersiz" -#: ../../locales/../src/engine/socket.cpp:1174 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "İpucu değeri geçersiz" -#: ../../locales/../src/interface/verifycertdialog.cpp:198 +#: ../../locales/../src/interface/verifycertdialog.cpp:256 msgid "Jurisdiction country:" msgstr "Yetkili ülke:" -#: ../../locales/../src/interface/verifycertdialog.cpp:200 +#: ../../locales/../src/interface/verifycertdialog.cpp:258 msgid "Jurisdiction locality:" msgstr "Yetkili yerleşim:" -#: ../../locales/../src/interface/verifycertdialog.cpp:199 +#: ../../locales/../src/interface/verifycertdialog.cpp:257 msgid "Jurisdiction state or province:" msgstr "Yetkili şehir:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1715 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1734 msgid "Keep directories on top" msgstr "Klasörler üstte görüntülensin" -#: ../../locales/../src/interface/Mainfrm.cpp:675 +#: ../../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 " @@ -4668,59 +4734,65 @@ "destekleyip desteklemediğini anlamak için bazı sınamalar yapsa da başarısız " "olabilir." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1974 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1989 msgid "Key exchange" -msgstr "Anahtar değişimi" +msgstr "Anahtar Takası" -#: ../../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 "Anahtar değişimi:" +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 +msgid "Key file" +msgstr "Anahtar dosyası" #: ../../locales/../src/interface/resources/xrc/menus.xrc:370 msgid "L&owest" msgstr "E&n düşük" -#: ../../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 "Dil" -#: ../../locales/../src/interface/Mainfrm.cpp:1508 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Dil değişti" -#: ../../locales/../src/interface/LocalListView.cpp:277 -#: ../../locales/../src/interface/RemoteListView.cpp:377 -#: ../../locales/../src/interface/search.cpp:84 +#: ../../locales/../src/interface/LocalListView.cpp:279 +#: ../../locales/../src/interface/RemoteListView.cpp:376 +#: ../../locales/../src/interface/search.cpp:112 msgid "Last modified" -msgstr "Son değişiklik" +msgstr "Son Değişiklik" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1251 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1270 msgid "Layout" msgstr "Yerleşim" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:824 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:843 msgid "Limit for concurrent &downloads:" msgstr "Eşzamanlı in&dirme:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:845 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:864 msgid "Limit for concurrent &uploads:" msgstr "Eşzamanlı &yükleme:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:264 msgid "Limit local ports" -msgstr "Yerel kapılar sınırlandırılsın" +msgstr "Yerel Kapı Sınırlandırması" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2138 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2157 msgid "Limit size of logfile" msgstr "Günlük dosyası boyutunun sınırı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2146 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2165 msgid "Limit:" msgstr "Sınır:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Satır uzunluğu aşıldı" @@ -4728,13 +4800,14 @@ msgid "Linked against" msgstr "Bağlantılı" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Dinleme soketi kapandı" -#: ../../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:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "Sıralama:" @@ -4742,50 +4815,50 @@ msgid "Lo&west available port:" msgstr "Kullanılabilecek e&n küçük kapı:" -#: ../../locales/../src/interface/edithandler.cpp:1149 -#: ../../locales/../src/interface/edithandler.cpp:1403 +#: ../../locales/../src/interface/edithandler.cpp:1132 +#: ../../locales/../src/interface/edithandler.cpp:1368 msgid "Local" msgstr "Yerel" -#: ../../locales/../src/engine/socket.cpp:1137 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Kullanılan yerel adres" -#: ../../locales/../src/engine/socket.cpp:1165 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Yerel bitim noktası kapatıldı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2215 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2240 msgid "Local file" msgstr "Yerel dosya" -#: ../../locales/../src/interface/manual_transfer.cpp:328 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Yerel dosya bulunamadı." -#: ../../locales/../src/interface/updater.cpp:365 -#: ../../locales/../src/interface/updater.cpp:457 +#: ../../locales/../src/interface/updater.cpp:371 +#: ../../locales/../src/interface/updater.cpp:463 #, c-format msgid "Local file is %s\n" msgstr "Yerel dosya %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 "Yerel dosya normal bir dosya değil bir klasör." -#: ../../locales/../src/interface/manual_transfer.cpp:369 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Yerel dosyanın geçerli bir adı yok." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1063 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1079 msgid "Local filters:" msgstr "Yerel süzgeçler:" -#: ../../locales/../src/interface/viewheader.cpp:325 +#: ../../locales/../src/interface/viewheader.cpp:334 msgid "Local site:" msgstr "Yerel site:" -#: ../../locales/../src/interface/verifycertdialog.cpp:192 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Yer:" @@ -4793,12 +4866,16 @@ msgid "Log file" msgstr "Günlük dosyası" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2092 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +msgid "Logged in" +msgstr "Oturum açıldı" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2111 #: ../../locales/../src/interface/settings/settingsdialog.cpp:115 msgid "Logging" msgstr "Günlük" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:805 +#: ../../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." @@ -4806,7 +4883,7 @@ "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." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4814,7 +4891,7 @@ "Giriş verisi ASCII olmayan karakterler içeriyor ve sunucu UTF-8 anlamıyor " "olabilir. Yerel karakter seti deneniyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Oturum açma işlemleri eksiksiz yapıldı ama hala oturum açılamadı. " @@ -4835,120 +4912,119 @@ "Oturum açma tipi yalnız FTP İnternet adresi ile birlikte kullanılabilir. " "Seçenek '%s' ya da '%s' olmalıdır." -#: ../../locales/../src/interface/queue.cpp:885 -#: ../../locales/../src/interface/queue.cpp:972 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Düşük" -#: ../../locales/../src/interface/queue.cpp:883 -#: ../../locales/../src/interface/queue.cpp:970 +#: ../../locales/../src/interface/queue.cpp:904 +#: ../../locales/../src/interface/queue.cpp:991 msgid "Lowest" msgstr "En Düşü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 "Kullanılabilecek en küçük kapı 1024 ile 65535 arasında olmalıdır." -#: ../../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/xmlfunctions.cpp:44 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:797 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:809 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:824 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:856 +#: ../../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 "Bozuk biçimli yığın: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:742 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Bozuk biçimli başlık bilgisi: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:562 +#: ../../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:2557 +#: ../../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 "El ile aktarım" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2990 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 msgid "Match all of the following" -msgstr "Şunların hepsine uyan" +msgstr "Aşağıdakilerin hepsine uyan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2991 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 msgid "Match any of the following" -msgstr "Şunların herhangi birine uyan" +msgstr "Aşağıdakilerin herhangi birine uyan" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" -msgstr "Şunların hiçbirine uymayan" +msgstr "Aşağıdakilerin hiçbirine uymayan" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:803 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:822 msgid "Maximum simultaneous &transfers:" msgstr "Eşzamanlı ak&tarım:" -#: ../../locales/../src/engine/socket.cpp:1178 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Bellek yerleşimi hatası" -#: ../../locales/../src/interface/Mainfrm.cpp:403 -#: ../../locales/../src/interface/Mainfrm.cpp:1829 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" -msgstr "İleti günlüğü" +msgstr "Günlük kaydı" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1337 msgid "Message log position" -msgstr "İleti günlüğünün konumu" +msgstr "Günlük kayıtlarının konumu" -#: ../../locales/../src/engine/socket.cpp:1162 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "İleti çok uzun" -#: ../../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:415 msgid "Minutes" msgstr "Dakika" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2130 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2155 msgid "Move &down" -msgstr "&Aşağı taşıyın" +msgstr "&Aşağı taşı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2124 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2149 msgid "Move &up" -msgstr "Y&ukarı taşıyın" +msgstr "Y&ukarı taşı" -#: ../../locales/../src/interface/LocalTreeView.cpp:1028 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Bilgisayarım" -#: ../../locales/../src/interface/LocalTreeView.cpp:1018 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Belgelerim" -#: ../../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:271 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:739 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:741 msgid "My Sites" msgstr "Sitelerim" @@ -4957,99 +5033,98 @@ msgid "N/a" msgstr "Yok" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2595 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2620 msgid "Name" msgstr "Ad" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:706 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1167 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:679 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1198 msgid "Name already exists" msgstr "Bu ad daha önce verilmiş" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:821 -#: ../../locales/../src/interface/sitemanager.cpp:751 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:790 +#: ../../locales/../src/interface/sitemanager.cpp:695 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:749 msgid "Name:" msgstr "Ad:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1754 msgid "Natural sort" msgstr "Doğal sıralama" -#: ../../locales/../src/interface/filteredit.cpp:347 +#: ../../locales/../src/interface/filteredit.cpp:345 msgid "Need to enter filter name" msgstr "Süzgeç adını yazmalısınız" -#: ../../locales/../src/interface/search.cpp:376 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Geçerli bir yol yazmalısınız" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1016 msgid "Need to specify a character encoding" msgstr "Karakter kodlaması belirtilmeli" -#: ../../locales/../src/engine/socket.cpp:1182 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Nodename ya da servname belirtilmedi ya da bilinmiyor" -#: ../../locales/../src/engine/socket.cpp:1169 +#: ../../locales/../src/engine/socket.cpp:1066 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:492 -#: ../../locales/../src/engine/socket.cpp:1154 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Ağa ulaşılamıyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2029 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2048 msgid "Never" msgstr "Hiçbir zaman" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:41 msgid "New &Folder" -msgstr "K&lasör Ekleyin" +msgstr "K&lasör Ekle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:16 msgid "New &tab" -msgstr "&Sekme ekleyin" +msgstr "&Sekme ekle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2788 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2825 #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:47 msgid "New Book&mark" -msgstr "Yer İ&mi Ekleyin" +msgstr "Yer İ&mi Ekle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2560 +#: ../../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: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: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 "Yeni yer imi" -#: ../../locales/../src/interface/LocalTreeView.cpp:1177 -#: ../../locales/../src/interface/RemoteListView.cpp:1337 -#: ../../locales/../src/interface/RemoteTreeView.cpp:1318 +#: ../../locales/../src/interface/LocalTreeView.cpp:1123 +#: ../../locales/../src/interface/RemoteListView.cpp:1306 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1232 msgid "New directory" -msgstr "Klasör oluşturun" +msgstr "Klasör oluştur" -#: ../../locales/../src/interface/welcome_dialog.cpp:53 +#: ../../locales/../src/interface/welcome_dialog.cpp:51 #, c-format msgid "New features and improvements in %s" msgstr "%s sürümündeki yeni özellik ve geliştirmeler" @@ -5058,25 +5133,25 @@ msgid "New filter" msgstr "Yeni süzgeç" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:914 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:925 msgid "New folder" -msgstr "Klasör oluşturun" +msgstr "Klasör oluştur" -#: ../../locales/../src/interface/sitemanager.cpp:625 -#: ../../locales/../src/interface/sitemanager.cpp:639 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2074 +#: ../../locales/../src/interface/sitemanager.cpp:585 +#: ../../locales/../src/interface/sitemanager.cpp:597 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "Yeni site" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1308 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1327 msgid "Next to the transfer queue" msgstr "Aktarım kuyruğu bölümünün yanında" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:812 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Hayır" -#: ../../locales/../src/engine/socket.cpp:1180 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Nodename için bir adres belirtilmemiş" @@ -5084,15 +5159,15 @@ msgid "No category to export selected" msgstr "Verilecek bir kategori seçilmemiş" -#: ../../locales/../src/interface/QueueView.cpp:2181 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Komut verilmedi, vazgeçiliyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3843 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "Dış IP adresi belirtilmemiş, varsayılan deneniyor." -#: ../../locales/../src/interface/edithandler.cpp:1090 +#: ../../locales/../src/interface/edithandler.cpp:1073 msgid "No files are currently being edited." msgstr "Şu an düzenlenen bir dosya yok." @@ -5110,98 +5185,98 @@ msgid "No images available" msgstr "Hiç görsel yok" -#: ../../locales/../src/interface/QueueView.cpp:3052 +#: ../../locales/../src/interface/QueueView.cpp:2974 msgid "No more files in the queue!" msgstr "Kuyrukta dosya yok!" -#: ../../locales/../src/interface/filter.cpp:341 -#: ../../locales/../src/interface/filter.cpp:405 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "No name for the filterset given." msgstr "Süzme setine ad verilmemiş" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2955 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 msgid "No program associated with filetype" msgstr "Bu dosya tipi ile ilişkili bir program bulunamadı" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2872 +#: ../../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' uzantılı dosyaları düzenlemek için ilişkilendirilmiş bir yazılım yok." -#: ../../locales/../src/engine/socket.cpp:1157 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Sunucuya giden yol bulunamadı" -#: ../../locales/../src/interface/search.cpp:236 +#: ../../locales/../src/interface/search.cpp:255 msgid "No search results" -msgstr "Arama sonuç vermedi" +msgstr "Henüz bir sonuç yok" -#: ../../locales/../src/interface/sitemanager.cpp:295 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Henüz kayıtlı bir site yok" -#: ../../locales/../src/engine/proxy.cpp:460 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Desteklenmeyen SOCKS5 kimlik denetimi kipi" -#: ../../locales/../src/interface/loginmanager.cpp:97 +#: ../../locales/../src/interface/loginmanager.cpp:101 msgid "No username given." msgstr "Kullanıcı adı yazılmadı." -#: ../../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/verifycertdialog.cpp:61 msgid "None" msgstr "Hiçbir şey" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2331 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2356 msgid "None selected yet" msgstr "Henüz seçilmemiş" -#: ../../locales/../src/engine/socket.cpp:1176 +#: ../../locales/../src/engine/socket.cpp:1073 msgid "Nonrecoverable failure in name resolution" msgstr "Ad çözümlenemedi" -#: ../../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: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:325 -#: ../../locales/../src/interface/queueview_failed.cpp:350 +#: ../../locales/../src/interface/queueview_failed.cpp:312 +#: ../../locales/../src/interface/queueview_failed.cpp:337 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:199 -#: ../../locales/../src/interface/state.cpp:508 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Bağlı değil" -#: ../../locales/../src/interface/RemoteListView.cpp:2073 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 msgid "Not connected to any server" msgstr "Sunucuya bağlı değil" -#: ../../locales/../src/interface/Mainfrm.cpp:584 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Sunucuya bağlı değil." -#: ../../locales/../src/interface/filelist_statusbar.cpp:27 +#: ../../locales/../src/interface/filelist_statusbar.cpp:15 msgid "Not connected." msgstr "Bağlı değil." -#: ../../locales/../src/engine/socket.cpp:1197 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Başlatılamadı, WSAStartup çağrılmalı" -#: ../../locales/../src/interface/Mainfrm.cpp:673 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5211,13 +5286,13 @@ 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:775 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:794 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." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1619 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1638 msgid "Number of decimal places:" msgstr "Ondalık basamak sayısı:" @@ -5225,40 +5300,43 @@ 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:1930 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1945 msgid "O&pen file" -msgstr "Dosyayı &açın" +msgstr "Dosyayı &aç" -#: ../../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: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 "Tamam" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 +msgid "OS version:" +msgstr "İşletim sistemi sürümü:" + #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:103 msgid "" "On the following pages, the selected transfer mode will be configured, as " @@ -5266,33 +5344,33 @@ msgstr "" "İzleyen sayfalarda aktarım ve -seçtiyseniz- başvuru kipleri ayarlanacak." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:822 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Bir kez" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2030 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 msgid "Once a day" msgstr "Günde bir" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2031 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2050 msgid "Once a week" msgstr "Haftada bir" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:530 +#: ../../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)" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:554 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:558 msgid "Open directory in system's file manager" msgstr "Sistem dosya yöneticisinde açık dosya" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:8 msgid "Open the Site Manager" -msgstr "Site Yöneticisi'ni açın" +msgstr "Site Yöneticisi'ni aç" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:9 msgid "Open the Site Manager." -msgstr "Site Yöneticisi'ni açın." +msgstr "Site Yöneticisi'ni açar." #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:10 msgid "Open the Site Manager. Right-click for a list of sites." @@ -5306,14 +5384,14 @@ msgid "Open the settings dialog of FileZilla" msgstr "FileZilla ayarları penceresini açar" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1681 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1696 msgid "Opened as:" msgstr "Olarak açılan:" -#: ../../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:1616 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1700 +#: ../../locales/../src/interface/LocalListView.cpp:1712 msgid "Opening failed" msgstr "Açılamadı" @@ -5329,43 +5407,43 @@ msgid "" "Opens the directory listing filter dialog. Right-click to toggle filters." msgstr "" -"Klasör listeleme süzgeci penceresini aç. Süzgeçleri açıp kapatmak için sağ " +"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:777 -msgid "Operating system" -msgstr "İşletim sistemi" - -#: ../../locales/../src/interface/FileZilla.cpp:310 -msgid "Operating system problem detected" -msgstr "İşletim sistemi hatası!" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:749 +msgid "Operating System:" +msgstr "İşletim Sistemi:" -#: ../../locales/../src/engine/socket.cpp:1148 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "İşlem zaten yürütülüyor" -#: ../../locales/../src/engine/socket.cpp:1139 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "İşlem yürütülüyor" -#: ../../locales/../src/engine/socket.cpp:1160 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "İşlem desteklenmiyor" -#: ../../locales/../src/interface/verifycertdialog.cpp:186 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Kurum:" -#: ../../locales/../src/engine/socket.cpp:1192 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:680 +msgid "Other SFTP options" +msgstr "Diğer SFTP Ayarları" + +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Diğer sistem hatası" -#: ../../locales/../src/interface/verifycertdialog.cpp:208 +#: ../../locales/../src/interface/verifycertdialog.cpp:266 msgid "Other:" msgstr "Diğer:" -#: ../../locales/../src/engine/socket.cpp:1143 -#: ../../locales/../src/engine/socket.cpp:1144 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Bellek bitti" @@ -5377,31 +5455,31 @@ msgid "Overwrite &if source newer" msgstr "Kaynak daha yen&iyse üstüne yazılsın" -#: ../../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: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 "Üzerine Yazılsın" -#: ../../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: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: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: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 "Boyut farklı ya da kaynak daha yeni ise üstüne yazılsın" -#: ../../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: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 "Kaynak daha yeniyse üstüne yazılsın" @@ -5413,7 +5491,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Boyut farklı ya da kaynak daha yeni ise üstüne ya&zılsın" -#: ../../locales/../src/interface/updater.cpp:213 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Kendi tipinizi oluşturun: %s\n" @@ -5422,23 +5500,23 @@ msgid "Owner permissions" msgstr "Sahip izinleri" -#: ../../locales/../src/interface/RemoteListView.cpp:379 -#: ../../locales/../src/interface/search.cpp:86 +#: ../../locales/../src/interface/RemoteListView.cpp:378 +#: ../../locales/../src/interface/search.cpp:114 msgid "Owner/Group" msgstr "Sahip/Grup" -#: ../../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" 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:723 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:742 msgid "P&roxy host:" msgstr "&Vekil sunucu:" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT komutu yöneltici ya da güvenlik duvarı tarafından bozuldu." @@ -5446,18 +5524,18 @@ msgid "Pa&ssive (recommended)" msgstr "Pa&sif (önerilen)" -#: ../../locales/../src/interface/Mainfrm.cpp:2398 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Parametre geçerli bir İnternet adresi değil" -#: ../../locales/../src/interface/updater.cpp:537 +#: ../../locales/../src/interface/updater.cpp:543 #, 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:2447 +#: ../../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 "Parol&a:" @@ -5470,39 +5548,39 @@ msgid "Passive mode" msgstr "Pasif Kip" -#: ../../locales/../src/interface/netconfwizard.cpp:604 -#: ../../locales/../src/interface/netconfwizard.cpp:617 -#: ../../locales/../src/interface/netconfwizard.cpp:628 +#: ../../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 "Varsayılan aktarım kipi Pasif olarak seçildi." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Parola zorunlu" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:150 -#: ../../locales/../src/interface/search.cpp:81 +#: ../../locales/../src/interface/search.cpp:109 msgid "Path" msgstr "Yol" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3127 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2248 +#: ../../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 "%s klasörü ve %s alt klasörü için yol oluşturulamıyor" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Yol bulunamadı:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2622 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2647 msgid "Paths" msgstr "Yollar" -#: ../../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:1111 +#: ../../locales/../src/interface/edithandler.cpp:1248 +#: ../../locales/../src/interface/edithandler.cpp:1338 +#: ../../locales/../src/interface/edithandler.cpp:1348 msgid "Pending removal" msgstr "Silinmesi bekleniyor" @@ -5510,13 +5588,13 @@ msgid "Permission" msgstr "İzin" -#: ../../locales/../src/engine/socket.cpp:1136 -#: ../../locales/../src/engine/socket.cpp:1145 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Erişim reddedildi" -#: ../../locales/../src/interface/RemoteListView.cpp:378 -#: ../../locales/../src/interface/search.cpp:85 +#: ../../locales/../src/interface/RemoteListView.cpp:377 +#: ../../locales/../src/interface/search.cpp:113 msgid "Permissions" msgstr "İzinler" @@ -5524,7 +5602,7 @@ msgid "Platform:" msgstr "Platform:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../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." @@ -5540,13 +5618,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:578 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5562,7 +5640,7 @@ msgid "Please enter a custom time format." msgstr "Lütfen özel bir saat biçimi yazın." -#: ../../locales/../src/interface/filter_conditions_dialog.cpp:737 +#: ../../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 "Lütfen 2010-07-18 gibi YYYY-AA-GG şeklinde bir tarih yazın." @@ -5582,7 +5660,7 @@ 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:391 +#: ../../locales/../src/interface/filter.cpp:390 #, 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" @@ -5612,7 +5690,7 @@ msgid "Please enter a password for this server:" msgstr "Lütfen bu sunucunun parolasını yazın:" -#: ../../locales/../src/interface/QueueView.cpp:2170 +#: ../../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" @@ -5624,12 +5702,12 @@ #: ../../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 ile 9999 saniye arasında bir zaman aşımı süresi yazın. 0 zaman aşımını " -"devre dışı bırakır." +"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:335 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Please enter a unique name for this filter set" msgstr "Bu süzme seti için eşsiz bir ad yazın" @@ -5637,11 +5715,11 @@ msgid "Please enter a username for this server:" msgstr "Bu sunucu için kullanıcı adını yazın:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "Geçerli bir kapı aralığı yazın." -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "Dış adresinizin alınabileceği bir İnternet adresi yazın" @@ -5649,10 +5727,9 @@ #: ../../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 değerinden büyük ya da eşit bir karşıya yükleme hızı sınırı yazın." +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:595 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5660,14 +5737,14 @@ "Lütfen standart FTP komutunu yazın.\n" "Standart ftp komutları kullanmak klasör önbelleğini siler." -#: ../../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: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 "Lütfen oluşturulacak klasörün adını yazın:" -#: ../../locales/../src/interface/RemoteListView.cpp:2712 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Please enter the name of the file which should be created:" msgstr "Lütfen oluşturulacak dosyanın adını yazın:" @@ -5675,12 +5752,12 @@ 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:158 +#: ../../locales/../src/interface/netconfwizard.cpp:152 msgid "Please enter your external IP address" msgstr "Lütfen dış IP adresinizi yazın" -#: ../../locales/../src/interface/netconfwizard.cpp:609 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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 " @@ -5698,7 +5775,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:633 +#: ../../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." @@ -5706,12 +5783,12 @@ "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:198 +#: ../../locales/../src/interface/FileZilla.cpp:157 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:610 +#: ../../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 " @@ -5735,7 +5812,7 @@ "kullanılıyor sanabilir. Bu şekilde bir güvenlik uyarısı alırsanız görmezden " "gelebilirsiniz." -#: ../../locales/../src/interface/Mainfrm.cpp:713 +#: ../../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." @@ -5752,7 +5829,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:586 +#: ../../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 " @@ -5761,42 +5838,42 @@ "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:3191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Lütfen bir işlem seçin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1627 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1642 msgid "Please select the categories you would like to import." -msgstr "Lütfen almak istediğiniz kategorileri seçin." +msgstr "Lütfen almak 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." msgstr "Lütfen varsayılan aktarım kipini seçin." -#: ../../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 "\"%s\" klasörü için yeni izinleri belirleyin." -#: ../../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 "\"%s\" dosyası için yeni izinleri belirleyin." -#: ../../locales/../src/interface/chmoddialog.cpp:49 +#: ../../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." -#: ../../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ütfen seçili klasör ve dosyaların izinlerini belirleyin." -#: ../../locales/../src/interface/chmoddialog.cpp:41 +#: ../../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." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../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. " @@ -5811,29 +5888,29 @@ "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." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1299 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1318 msgid "Positio&n of the message log:" msgstr "İleti gü&nlüğünün konumu:" -#: ../../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 "Posta kodu:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1012 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1031 msgid "Pre&allocate space before downloading" msgstr "İndirmeden önce yer &ayrılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1008 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1027 msgid "Preallocation" -msgstr "Yer ayırma" +msgstr "Yer Ayırma" -#: ../../locales/../src/interface/sitemanager.cpp:285 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1797 +#: ../../locales/../src/interface/sitemanager.cpp:270 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "Öntanımlı Siteler" -#: ../../locales/../src/interface/Mainfrm.cpp:712 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Dosya zaman damgaları korunuyor" @@ -5841,7 +5918,7 @@ msgid "Preview:" msgstr "Önizleme:" -#: ../../locales/../src/engine/tlssocket.cpp:1060 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "Birincil bağlantı ve veri bağlantı sertifikaları uyuşmuyor." @@ -5851,17 +5928,17 @@ #: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" -msgstr "Sürüm bilgisini konsola gönderin ve çıkın" +msgstr "Sürüm bilgisini konsola gönderip çık" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1714 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Klasörler öncelikli (varsayılan)" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Öncelik" -#: ../../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." @@ -5871,79 +5948,88 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:629 msgid "Private &keys:" -msgstr "Kişisel &anahtarlar:" +msgstr "Kişisel &Anahtarlar:" #: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:127 msgid "Pro&tocol:" msgstr "İle&tişim Kuralı:" #: ../../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 "Ve&kil sunucu parolası:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:129 #: ../../locales/../src/interface/resources/xrc/menus.xrc:338 msgid "Process &Queue" -msgstr "Aktarım &kuyruğunu işletin" +msgstr "&Kuyruktaki dosyaları aktar" -#: ../../locales/../src/engine/socket.cpp:1141 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "İşlem dosyası tablosu doldu" -#: ../../locales/../src/engine/socket.cpp:1146 +#. @translator: Example: Processed 5 files in 1 directory +#: ../../locales/../src/interface/recursive_operation_status.cpp:110 +#, c-format +msgid "Processed %s in %s." +msgstr "%s %s içinde işlendi." + +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "İletişim kuralı desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1199 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "İletişim kuralı belirtilen soket tipi için desteklenmiyor" -#: ../../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 "İletişim Kuralı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:733 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:752 msgid "Proxy &port:" msgstr "Vekil sunucu ka&pısı:" #: ../../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 "Vekil sunucu k&ullanıcı adı:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Vekil sunucu oturumu açılamadı" -#: ../../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 "Vekil sunucu ile iletişim kurulamadı: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4298 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:320 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Vekil sunucu yanıtı: %s" -#: ../../locales/../src/engine/proxy.cpp:379 -#: ../../locales/../src/engine/proxy.cpp:514 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" msgstr "Vekil sunucu isteği başarısız oldu: %s" -#: ../../locales/../src/engine/proxy.cpp:539 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "" -"Vekil sunucu isteği başarısız oldu: CONNECT yanıtında bilinmeyen adres tipi" +"Vekil sunucu isteği başarısız oldu: CONNECT yanıtındaki adres tipi bilinmiyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4327 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Vekil sunucu ayarlanmış ancak vekil sunucu adı ya da kapı geçersiz" @@ -5952,55 +6038,54 @@ msgstr "Genel Anahtar Kimlik Doğrulaması" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:73 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:338 msgid "Public key algorithm:" -msgstr "Genel anahtar algoritması:" +msgstr "Genel Anahtar Algoritması:" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:470 msgid "Public permissions" msgstr "Genel izinler" -#: ../../locales/../src/interface/QueueView.cpp:3132 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Kuyruk tamamen işlendi" -#: ../../locales/../src/interface/statusbar.cpp:427 +#: ../../locales/../src/interface/statusbar.cpp:429 #, c-format msgid "Queue: %s MiB" msgstr "Aktarım Kuyruğu: %s MiB" -#: ../../locales/../src/interface/statusbar.cpp:357 +#: ../../locales/../src/interface/statusbar.cpp:366 #, c-format msgid "Queue: %s%s" msgstr "Aktarım Kuyruğu: %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 "Aktarım Kuyruğu: boş" -#: ../../locales/../src/interface/QueueView.cpp:439 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Kuyruktakiler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3127 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" -msgstr "Sıralanıyor:" +msgstr "Kuyruğa Alınıyor:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:397 msgid "R&eboot system" -msgstr "Sistemi y&eniden başlatın" +msgstr "Sistem y&eniden başlatılsın" #: ../../locales/../src/interface/resources/xrc/menus.xrc:118 msgid "R&emote directory tree" msgstr "U&zak klasör ağacı" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:458 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:473 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:456 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:474 msgid "R&eset and requeue selected files" -msgstr "Burayı boşaltın ve s&eçili dosyaları yeniden kuyruklayın" +msgstr "Burayı boşalt ve s&eçili dosyaları yeniden kuyruğa ekle" -#: ../../locales/../src/interface/Mainfrm.cpp:609 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Standart FTP komutu" @@ -6011,13 +6096,13 @@ #: ../../locales/../src/interface/resources/xrc/menus.xrc:272 #: ../../locales/../src/interface/resources/xrc/menus.xrc:316 msgid "Re&fresh" -msgstr "&Yenileyin" +msgstr "&Yenile" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:172 msgid "Re&name" -msgstr "Ye&niden Adlandırın" +msgstr "Ye&niden Adlandır" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6033,12 +6118,12 @@ msgid "Read-only" msgstr "Salt-okunur" -#: ../../locales/../src/interface/Mainfrm.cpp:1064 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 msgid "Really cancel current operation?" msgstr "Yürürlükteki işlem iptal edilsin mi?" -#: ../../locales/../src/interface/RemoteListView.cpp:1413 -#: ../../locales/../src/interface/search.cpp:776 +#: ../../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 "" @@ -6046,70 +6131,70 @@ msgstr[0] "" "Gerçekten sunucudaki %d klasörü içindekilerle beraber silmek istiyor musunuz?" -#: ../../locales/../src/interface/RemoteListView.cpp:1411 -#: ../../locales/../src/interface/search.cpp:774 +#: ../../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] "Gerçekten sunucudaki %d dosyayı silmek istiyor musunuz?" -#: ../../locales/../src/interface/RemoteListView.cpp:1418 -#: ../../locales/../src/interface/search.cpp:781 +#: ../../locales/../src/interface/RemoteListView.cpp:1387 +#: ../../locales/../src/interface/search.cpp:744 #, 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:1120 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1041 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?" -#: ../../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 "Gerçekten seçili tüm dosya ve klasörleri silmek istiyor musunuz?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Neden" -#: ../../locales/../src/interface/QueueView.cpp:3125 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" -msgstr "Yeniden başlatın" +msgstr "Yeniden başlat" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:531 msgid "Rec&urse into subdirectories" msgstr "Alt klasörlere de &uygulansın" -#: ../../locales/../src/engine/tlssocket.cpp:199 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, 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:3070 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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:2068 -#: ../../locales/../src/engine/directorylistingparser.cpp:2083 +#: ../../locales/../src/engine/directorylistingparser.cpp:1992 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "10.000 karakterden uzun bir satır alındı, iptal ediliyor." -#: ../../locales/../src/interface/netconfwizard.cpp:1013 -#: ../../locales/../src/interface/netconfwizard.cpp:1022 -#: ../../locales/../src/interface/netconfwizard.cpp:1045 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Alınan veri bozuk" -#: ../../locales/../src/interface/updater.cpp:516 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Sürüm bilgisinde geçersiz karakterler alındı." -#: ../../locales/../src/engine/tlssocket.cpp:202 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:509 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Alınan sürüm bilgisi çok büyük" @@ -6123,20 +6208,32 @@ #: ../../locales/../src/interface/resources/xrc/settings.xrc:184 msgid "Reconnection settings" -msgstr "Yeniden bağlanma ayarları" +msgstr "Yeniden Bağlanma Ayarları" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:62 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:63 msgid "Reconnects to the last used server" msgstr "Son kullanılan sunucuya bağlanır" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:658 +#: ../../locales/../src/interface/recursive_operation_status.cpp:92 +msgid "Recursively adding files to queue." +msgstr "Alt klasörlerdeki dosyalar da kuyruğa eklensin." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:98 +msgid "Recursively changing permissions." +msgstr "Alt klasörlerdeki izinler de değiştirilsin." + +#: ../../locales/../src/interface/recursive_operation_status.cpp:95 +msgid "Recursively deleting files and directories." +msgstr "Alt klasörlerdeki dosya ve klasörler de silinsin." + +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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:665 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:652 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:659 #, c-format msgid "Redirection to invalid or unsupported address: %s" msgstr "Geçersiz ya da desteklenmeyen adrese yönlendirme: %s" @@ -6144,42 +6241,42 @@ #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:41 #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:42 msgid "Refresh the file and folder lists" -msgstr "Dosya ve klasör listelerini yenileyin" +msgstr "Dosya ve klasör listelerini yeniler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3660 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Parolalar hatırlansın" -#: ../../locales/../src/interface/edithandler.cpp:1112 +#: ../../locales/../src/interface/edithandler.cpp:1095 msgid "Remote" msgstr "Uzaktaki" -#: ../../locales/../src/engine/tlssocket.cpp:840 +#: ../../locales/../src/engine/tlssocket.cpp:854 msgid "Remote certificate not trusted." msgstr "Uzaktaki sertifikaya güvenilmiyor." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2250 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2275 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" -msgstr "Uzaktaki dosya" +msgstr "Uzak Dosya" -#: ../../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/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 "Uzak dosya arayın" +msgstr "Uzak dosya arama" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1098 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1114 msgid "Remote filters:" msgstr "Uzaktaki süzgeçler:" -#: ../../locales/../src/interface/edithandler.cpp:1103 +#: ../../locales/../src/interface/edithandler.cpp:1086 msgid "Remote path" msgstr "Uzaktaki yol" -#: ../../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 " @@ -6188,7 +6285,7 @@ "Uzaktaki yola gidilemedi. Yolun doğru olduğundan ve geçerli sitenin sunucu " "tipi (%s) tarafından desteklendiğine emin olun." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084 +#: ../../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 " @@ -6198,170 +6295,170 @@ "tarafında seçilmiş olan sunucu tipi (%s) tarafından desteklendiğine emin " "olun." -#: ../../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:1117 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:350 +#: ../../locales/../src/interface/manual_transfer.cpp:332 msgid "Remote path could not be parsed." msgstr "Uzaktaki yola gidilemedi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3109 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Uzaktaki yolun işlenişi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1701 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1716 msgid "Remote path:" msgstr "Uzaktaki yol:" -#: ../../locales/../src/interface/viewheader.cpp:524 +#: ../../locales/../src/interface/viewheader.cpp:530 msgid "Remote site:" -msgstr "Uzaktaki site:" +msgstr "Uzak site:" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:448 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:463 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:446 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:464 msgid "Remove &all" -msgstr "Tümünü &silin" +msgstr "Tümünü &sil" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:455 -#: ../../locales/../src/interface/resources/xrc/menus.xrc:470 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:453 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:471 msgid "Remove &selected" -msgstr "&Seçilileri silin" +msgstr "&Seçilileri sil" -#: ../../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: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 "Dosyayı yeniden adlandırın" +msgstr "Dosyayı yeniden adlandır" -#: ../../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:576 msgid "Rename selected directory" -msgstr "Seçili klasörü yeniden adlandırın" +msgstr "Seçili klasörü yeniden adlandır" #: ../../locales/../src/interface/resources/xrc/menus.xrc:281 #: ../../locales/../src/interface/resources/xrc/menus.xrc:325 msgid "Rename selected files and directories" -msgstr "Seçili dosya ve klasörleri yeniden adlandırın" +msgstr "Seçili dosya ve klasörleri yeniden adlandır" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3477 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2447 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "'%s' adı '%s' olarak değiştiriliyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 msgid "Reporting bugs and feature requests" msgstr "Hataları ve isteklerinizi iletebilirsiniz" -#: ../../locales/../src/engine/proxy.cpp:370 +#: ../../locales/../src/engine/proxy.cpp:398 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:373 +#: ../../locales/../src/engine/proxy.cpp:401 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:367 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "İstek gerçekleştirilemedi ya da reddedildi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:528 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:539 msgid "Require explicit FTP over TLS" msgstr "TLS üzerinden açıkta FTP istensin" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:529 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:540 msgid "Require implicit FTP over TLS" msgstr "TLS üzerinden örtülü FTP istensin" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:466 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:467 msgid "Reset and requeue &all" msgstr "Bur&ayı boşaltın ve tümünü yeniden kuyruğa alın" -#: ../../locales/../src/engine/socket.cpp:1187 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Çözümlenen protokol bilinmiyor" -#: ../../locales/../src/engine/ControlSocket.cpp:1061 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:470 +#: ../../locales/../src/engine/ControlSocket.cpp:1082 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:459 #, c-format msgid "Resolving address of %s" msgstr "%s için adres çözümleniyor" -#: ../../locales/../src/engine/socket.cpp:1147 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Kaynak geçici olarak kullanım dışında" -#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/engine/logging.cpp:113 #: ../../locales/../src/interface/netconfwizard.cpp:411 -#: ../../locales/../src/interface/StatusView.cpp:279 -#: ../../locales/../src/interface/StatusView.cpp:339 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Yanıt:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3055 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Sonuçlar:" -#: ../../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: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 "Dosya aktarımı sürdürülsün" -#: ../../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." msgstr "" "Sunucu ile istemcinin satır sonu karakteri farklı ise sorunlara yol açabilir." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1278 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:902 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "\"%s\" klasör listesi alınıyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1275 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:899 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Klasör listesi alınıyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, 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 dosyalara &bakın..." +msgstr "Şu anda düzenlenen dosyaları &görüntüle..." -#: ../../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 "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ın" +msgstr "Sistemi &kapat" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3000 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" -msgstr "&Durdurun" +msgstr "&Durdur" #: ../../locales/../src/interface/resources/xrc/menus.xrc:405 msgid "S&uspend system" -msgstr "Sistemi as&kıya alın" +msgstr "Sistemi as&kıya al" #: ../../locales/../src/interface/resources/xrc/menus.xrc:92 msgid "S&ynchronized browsing" @@ -6371,11 +6468,11 @@ 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:141 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 vekil sunucu şuraya bağlanacak: %s" @@ -6384,56 +6481,56 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Ayarlar kaydedilsin" -#: ../../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:978 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:457 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:969 +#: ../../locales/../src/interface/manual_transfer.cpp:439 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:980 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:1754 +#: ../../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:1756 +#: ../../locales/../src/interface/QueueView.cpp:1706 msgid "Scanning for files to upload" -msgstr "Karşıya yüklenecek dosyalar taranıyor" +msgstr "Yüklenecek dosyalar taranıyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2983 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" -msgstr "Arama &kısıtları:" +msgstr "Arama ö&lçütleri:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Arama &klasörü:" #: ../../locales/../src/interface/resources/xrc/toolbar.xrc:86 msgid "Search for files recursively." -msgstr "Yinelenen dosyaları arayın." +msgstr "Alt klasörlerdeki dosyaları arar." #: ../../locales/../src/interface/resources/xrc/menus.xrc:191 msgid "Search server for files" msgstr "Sunucuda dosya arayın" -#: ../../locales/../src/interface/statusbar.cpp:500 +#: ../../locales/../src/interface/statusbar.cpp:502 msgid "Security information" -msgstr "Gizlilik bilgisi" +msgstr "Güvenlik bilgileri" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 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:2338 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2363 msgid "Sele&ct server" msgstr "Sunucu &seçin" @@ -6441,17 +6538,17 @@ msgid "Select &page:" msgstr "Sayfa &seçin:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1405 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1424 msgid "Select Theme" msgstr "Tema Seçimi" -#: ../../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 "" "Aktarılan hedef dosya zaten var ise yapılmasını istediğiniz işlemi seçin." -#: ../../locales/../src/interface/edithandler.cpp:1573 +#: ../../locales/../src/interface/edithandler.cpp:1531 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:104 msgid "Select default editor" msgstr "Varsayılan düzenleyiciyi seçin" @@ -6472,15 +6569,16 @@ "Kuyruktaki seçilmiş dosyalar için varsayılan 'Hedef Dosya Var' işlemini " "seçin." -#: ../../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 "Seçilen dosya kişisel anahtar içeriyor" +msgstr "Kişisel anahtarın bulunduğu dosyayı seçin" #: ../../locales/../src/interface/export.cpp:38 msgid "Select file for exported data" msgstr "Verilecek veriler için bir dosya seçin" #: ../../locales/../src/interface/export.cpp:34 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Aktarılmış kuyruk için bir dosya seçin" @@ -6489,7 +6587,7 @@ msgstr "Ayarların verileceği dosyayı seçin" #: ../../locales/../src/interface/export.cpp:32 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2126 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "Verilecek siteler için bir dosya seçin" @@ -6497,107 +6595,107 @@ msgid "Select file to import settings from" msgstr "Ayarların alınacağı dosyayı seçin" -#: ../../locales/../src/interface/manual_transfer.cpp:250 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" -msgstr "Karşıya yüklenecek dosyayı seçin" +msgstr "Yüklenecek dosyayı seçin" -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304 -msgid "Select filename for converted keyfile" -msgstr "Dönüştürülmüş anahtar dosyası için bir dosya adı seçin" +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 +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:2877 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Bu dosyaların nasıl açılacağını seçin." -#: ../../locales/../src/interface/search.cpp:498 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Hedef indirme klasörünü seçin" -#: ../../locales/../src/interface/manual_transfer.cpp:245 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Hedef dosya adını seçin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1551 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1566 msgid "Select the categories to export:" -msgstr "Verilecek kategorileri seçin:" +msgstr "Verilecek bilgileri seçin:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1477 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1492 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:465 +#: ../../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 klasörün içeriği aktarılmak üzere seçilmiş." -#: ../../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 klasör seçilmiş." -#: ../../locales/../src/interface/search.cpp:463 +#: ../../locales/../src/interface/search.cpp:479 #, 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: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] "Seçilmiş %d dosya toplam %s boyutunda." -#: ../../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] "Seçilmiş dosya %d. Toplam boyut: En az %s" -#: ../../locales/../src/interface/search.cpp:470 +#: ../../locales/../src/interface/search.cpp:485 #, 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:68 +#: ../../locales/../src/interface/filelist_statusbar.cpp:52 #, 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:66 +#: ../../locales/../src/interface/filelist_statusbar.cpp:50 #, 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:1514 -#: ../../locales/../src/interface/edithandler.cpp:1593 +#: ../../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 "Seçilmiş düzenleyici bulunamadı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1760 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1827 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1775 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1842 msgid "Selected file already being edited" msgstr "Seçilmiş dosya zaten düzenleniyor" -#: ../../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 "Seçilmiş dosya zaten yüklenmiş" -#: ../../locales/../src/interface/edithandler.cpp:1691 +#: ../../locales/../src/interface/edithandler.cpp:1648 msgid "Selected file is already opened" msgstr "Seçilmiş dosya zaten açık" -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1720 msgid "Selected file is still being edited" msgstr "Seçilmiş dosya şu anda düzenleniyor" -#: ../../locales/../src/interface/filter.cpp:305 +#: ../../locales/../src/interface/filter.cpp:304 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:307 +#: ../../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." @@ -6606,7 +6704,7 @@ "kullanıyor.\n" "Bu sunucu için siteye özgü yer imlerini kullanın." -#: ../../locales/../src/engine/engineprivate.cpp:285 +#: ../../locales/../src/engine/engineprivate.cpp:291 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." @@ -6619,35 +6717,34 @@ 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:4405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Canlı-tut komutu gönderiliyor" #: ../../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 "Seri No:" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:250 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:292 msgid "Server &Type:" msgstr "Sunucu &Tipi:" -#: ../../locales/../src/engine/tlssocket.cpp:726 +#: ../../locales/../src/engine/tlssocket.cpp:743 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:893 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:946 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Sunucu ASCII dışındaki karakterleri desteklemiyor." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4239 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6656,15 +6753,15 @@ "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:2494 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 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:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 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:4250 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6673,7 +6770,7 @@ "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:841 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6681,11 +6778,11 @@ "Sunucu bir hesaba gerek duyuyor olabilir. Site Yöneticisi'nde bir hesap " "oluşturmayı deneyin." -#: ../../locales/../src/engine/ControlSocket.cpp:343 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Sunucu boş bir yol döndürdü." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:641 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:660 msgid "" "Server sent an additional login prompt. You need to use the interactive " "login type." @@ -6693,13 +6790,13 @@ "Sunucu ek giriş soruları soruyor. Etkileşimli oturum açma tipini " "kullanmalısınız." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3803 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3797 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6707,55 +6804,54 @@ "Sunucu yöneltilemeyen bir adresle pasif bir yanıt verdi. Bunun yerine sunucu " "adresi kullanılacak." -#: ../../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: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:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:519 +#: ../../locales/../src/interface/netconfwizard.cpp:530 msgid "Server sent unexpected reply." msgstr "Sunucu beklenmeyen bir yanıt verdi." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2057 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2082 msgid "Server to client MAC:" msgstr "Sunucudan istemcinin MAC adresine:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2072 msgid "Server to client cipher:" msgstr "Sunucudan istemciye şifre:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2401 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2426 msgid "Server&type:" msgstr "Sunucu &Tipi:" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Sunucu/Yerel dosya" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1691 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2324 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1706 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2349 msgid "Server:" msgstr "Sunucu:" -#: ../../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 "Oturum ayrıntıları" +msgstr "Oturum Ayrıntıları" #: ../../locales/../src/interface/resources/xrc/menus.xrc:352 msgid "Set &Priority" -msgstr "Öncelik &Belirleyin" +msgstr "Önceliği &Belirle" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3625 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2326 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" -msgstr "'%s' izinlerini '%s' üzerine atayın" +msgstr "'%s' izinleri '%s' olarak güncelleniyor" -#: ../../locales/../src/engine/transfersocket.cpp:817 +#: ../../locales/../src/engine/transfersocket.cpp:793 msgid "SetSocketBufferSize called without socket" msgstr "Soket olmadan SetSocketBufferSize çağrıldı" @@ -6763,45 +6859,47 @@ msgid "Settings" msgstr "Ayarlar" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2254 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:781 +msgid "Settings directory:" +msgstr "Ayarlar klasörü:" + +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2273 msgid "Show &raw directory listing" -msgstr "Ham klasö&r listesini görüntülensin" +msgstr "Ham klasö&r listesi görüntülensin" #: ../../locales/../src/interface/resources/xrc/menus.xrc:223 msgid "Show &welcome dialog..." -msgstr "&Hoş geldiniz penceresini görüntüleyin..." +msgstr "&Hoşgeldiniz penceresini görüntüle..." -#: ../../locales/../src/interface/Mainfrm.cpp:2245 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 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" #: ../../locales/../src/interface/resources/xrc/update.xrc:210 msgid "Show details" -msgstr "Ayrıntılara bakın" +msgstr "Ayrıntıları görüntüle" -#: ../../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 "" -"İsteğe uyarlanmış tarih ve saat biçinleri ile ilgili ayrıntılar görüntülensin" +msgstr "Uyarlanmış tarih ve saat biçimleri ile ilgili ayrıntıları görüntüle" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:443 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:441 msgid "Shows available TLS ciphers" -msgstr "Kullanılabilecek TLS şifrelerini gösterir" +msgstr "Kullanılabilecek TLS şifrelerini görüntüler" #: ../../locales/../src/interface/cmdline.cpp:6 msgid "Shows this help dialog" msgstr "Bu yardım penceresini görüntüler" -#: ../../locales/../src/interface/QueueView.cpp:3121 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" -msgstr "Şimdi kapatın" +msgstr "Şimdi kapat" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:81 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:346 msgid "Signature algorithm:" -msgstr "İmza algoritması:" +msgstr "İmza Algoritması:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1608 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1623 msgid "Site &Manager entries" msgstr "&Site Yöneticisi kayıtları" @@ -6809,55 +6907,56 @@ msgid "Site Manager" msgstr "Site Yöneticisi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:975 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:986 msgid "Site Manager - Cannot remember password" msgstr "Site Yöneticisi - Parolalar hatırlanmıyor" -#: ../../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: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:1103 +#: ../../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 "Site Yöneticisi - Geçersiz veri" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:330 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 msgid "Site Manager already open" msgstr "Site Yöneticisi zaten açık" -#: ../../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: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 "Site bulunamadı." -#: ../../locales/../src/interface/sitemanager.cpp:426 +#: ../../locales/../src/interface/sitemanager.cpp:411 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:464 -#: ../../locales/../src/interface/sitemanager.cpp:557 -#: ../../locales/../src/interface/sitemanager.cpp:727 -#: ../../locales/../src/interface/sitemanager.cpp:808 +#: ../../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 "Site yolu bozuk." -#: ../../locales/../src/interface/bookmarks_dialog.cpp:260 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:252 msgid "Site-specific bookmarks" msgstr "Siteye özel yer imleri" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:94 -#: ../../locales/../src/interface/bookmarks_dialog.cpp:538 +#: ../../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" @@ -6867,64 +6966,64 @@ "kullanılabilir.\n" "Geçerli bağlantıyı Site Yöneticisine eklemek istiyor musunuz?" -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Boyut" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1583 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1602 msgid "Size formatting" -msgstr "Boyut biçimi" +msgstr "Boyut Biçimi" #: ../../locales/../src/interface/fileexistsdlg.cpp:43 msgid "Size unknown" msgstr "Boyut bilinmiyor" -#: ../../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: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 "Dosyayı atlayın" +msgstr "Dosyayı atla" -#: ../../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: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 indirilmesi atlanıyor" -#: ../../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: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 yüklemesi atlanıyor" -#: ../../locales/../src/engine/socket.cpp:1151 +#: ../../locales/../src/engine/socket.cpp:1047 msgid "Socket address outside address space" msgstr "Soket adresi adres aralığının dışında" -#: ../../locales/../src/engine/socket.cpp:1153 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Soket zaten bağlı" -#: ../../locales/../src/engine/socket.cpp:1161 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Soket kapatılmış" -#: ../../locales/../src/engine/socket.cpp:1158 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Soket bağlı değil" -#: ../../locales/../src/engine/socket.cpp:1200 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Soket tipi bu adres ailesinde desteklenmiyor" -#: ../../locales/../src/interface/Mainfrm.cpp:1199 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." -msgstr "Bazı dosyalar düzenlenmiş ve karşıya yüklenmeleri gerekli." +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 @@ -6935,124 +7034,127 @@ "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:1716 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1735 msgid "Sort directories inline" -msgstr "Klasörleri sıralayın" +msgstr "Klasörleri sırala" -#: ../../locales/../src/interface/filelistctrl.cpp:460 +#: ../../locales/../src/interface/filelistctrl.cpp:466 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." -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1700 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1719 msgid "Sorting" -msgstr "Sıralanıyor" +msgstr "Sıralama" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1707 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1726 msgid "Sorting &mode:" msgstr "Sırala&ma kipi:" -#: ../../locales/../src/interface/RemoteTreeView.cpp:100 +#: ../../locales/../src/interface/RemoteTreeView.cpp:102 msgid "Source and path of the drop operation are identical" -msgstr "Bırakma operasyonunun kaynak ve yolu benzer" +msgstr "Bırakma işleminin kaynak ve yolu benzer" -#: ../../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 "Kaynak ve hedef dosya aynı olmayabilir" #: ../../locales/../src/interface/RemoteListView.cpp:141 msgid "Source and target of the drop operation are identical" -msgstr "Bırakma operasyonunun kaynak ve hedefi aynı" +msgstr "Bırakma işleminin kaynak ve hedefi aynı" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:24 msgid "Source file:" msgstr "Kaynak dosya:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3602 +#: ../../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 "Hız sınırları" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:873 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:892 msgid "Speed limits" -msgstr "Hız sınırları" +msgstr "Hız Sınırları" -#: ../../locales/../src/interface/statusbar.cpp:573 +#: ../../locales/../src/interface/statusbar.cpp:575 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:576 +#: ../../locales/../src/interface/statusbar.cpp:578 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:2048 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2067 msgid "Stable and beta versions" msgstr "Kararlı ve beta sürümler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2047 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2066 msgid "Stable versions only" msgstr "Yalnız kararlı sürümler" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:2049 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:2068 msgid "Stable, beta and nightly versions" msgstr "Kararlı, beta ve gecelik sürümler" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2532 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2557 msgid "Start transfer &immediately" -msgstr "Aktarıma &hemen başlayın" +msgstr "Aktarım &hemen başlatılsın" #: ../../locales/../src/interface/cmdline.cpp:7 msgid "Start with opened Site Manager" msgstr "Başlangıçta Site Yöneticisi açılsın" -#: ../../locales/../src/interface/updater.cpp:207 +#: ../../locales/../src/interface/updater.cpp:213 #, 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:2196 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1544 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "%s indirilmesine başlanıyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2199 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1547 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" -msgstr "%s karşıya yüklemesine başlanıyor" +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" -#: ../../locales/../src/interface/verifycertdialog.cpp:191 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "State or province:" msgstr "Şehir:" -#: ../../locales/../src/interface/edithandler.cpp:1104 -#: ../../locales/../src/interface/queue.cpp:1191 +#: ../../locales/../src/interface/edithandler.cpp:1087 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Durum" -#: ../../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:295 +#: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" msgstr "Durum:" #: ../../locales/../src/interface/resources/xrc/menus.xrc:342 msgid "Stop and remove &all" -msgstr "Durdurun ve hepsini &silin" +msgstr "Durdur ve hepsini &sil" -#: ../../locales/../src/interface/verifycertdialog.cpp:195 +#: ../../locales/../src/interface/recursive_operation_status.cpp:40 +msgid "Stop recursive operation" +msgstr "Alt klasör işlemini durdur" + +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Sokak:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:116 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:381 msgid "Subject of certificate" -msgstr "Sertifika konusu" +msgstr "Sertifika Konusu" #: ../../locales/../src/interface/queueview_successful.cpp:12 msgid "Successful transfers" @@ -7062,11 +7164,11 @@ msgid "Summary of test results:" msgstr "Sınama sonuçları özeti:" -#: ../../locales/../src/interface/QueueView.cpp:3129 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" -msgstr "Şimdi askya alın" +msgstr "Şimdi askya al" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3208 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3245 msgid "" "Symlinks to files are not affected by this choice, such symlinks are always " "deleted." @@ -7074,28 +7176,29 @@ "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: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: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 "Eşzamanlı tarama" -#: ../../locales/../src/interface/state.cpp:400 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Eşzamanlı tarama devre dışı." #: ../../locales/../src/interface/quickconnectbar.cpp:85 -#: ../../locales/../src/interface/quickconnectbar.cpp:123 +#: ../../locales/../src/interface/quickconnectbar.cpp:122 msgid "Syntax error" msgstr "Sözdizimi hatası" @@ -7104,8 +7207,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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Komut satırında sözdizimi hatası" @@ -7113,11 +7216,15 @@ msgid "System" msgstr "Sistem" -#: ../../locales/../src/engine/socket.cpp:1142 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:793 +msgid "System details" +msgstr "Sistem ayrıntıları" + +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" -msgstr "Sistemde açılabilecek dosya sınırı aşıldı" +msgstr "Sistemde açılabilecek dosya sayısı sınırı aşıldı" -#: ../../locales/../src/engine/socket.cpp:1198 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Sistemin ağ altsistemi bozuldu" @@ -7125,19 +7232,19 @@ msgid "T&oolbar" msgstr "A&raç çubuğu" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:313 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS bağlantısı kuruldu, HTTP isteği gönderiliyor" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TSL bağlantısı kuruldu, hoş geldin iletisi bekleniyor..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:392 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS bağlantısı kuruldu." -#: ../../locales/../src/engine/proxy.cpp:501 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL süresi doldu" @@ -7149,15 +7256,15 @@ msgid "Target file:" msgstr "Hedef Dosya:" -#: ../../locales/../src/interface/RemoteListView.cpp:2728 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Hedef dosya zaten var!" -#: ../../locales/../src/interface/RemoteListView.cpp:1630 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "Target filename already exists, really continue?" msgstr "Hedef dosya adı zaten var, devam edilsin mi?" -#: ../../locales/../src/engine/socket.cpp:1171 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Ad geçici olarak çözümlenemedi" @@ -7165,11 +7272,15 @@ msgid "Test results" msgstr "Sınama sonuçları" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Sunucunun aktarımı sürdürebilme yeteneği sınanıyor." -#: ../../locales/../src/interface/sitemanager_dialog.cpp:329 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:750 +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 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 " @@ -7187,34 +7298,29 @@ "Site Yöneticisi başka bir FileZilla 3 oturumunda açık.\n" "Lütfen onu kapatın yoksa veri silinemez." -#: ../../locales/../src/interface/xmlfunctions.cpp:386 -#, c-format -msgid "The XML document is not well-formed: %s" -msgstr "%s XML dosyası uygun şekilde hazırlanmamış." - -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Yazdığınız adres: %s" -#: ../../locales/../src/engine/socket.cpp:1177 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "ai_family üyesi desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1190 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "ai_socktype üyesi desteklenmiyor" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:807 -#: ../../locales/../src/interface/sitemanager.cpp:714 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:777 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Yer imi eklenemedi." -#: ../../locales/../src/interface/sitemanager.cpp:796 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Yer imleri silinemedi." -#: ../../locales/../src/interface/statusbar.cpp:462 +#: ../../locales/../src/interface/statusbar.cpp:464 msgid "The connection is encrypted. Click icon for details." msgstr "Bu bağlantı şifrelenmiş. Ayrıntılar için simgeye tıklayın." @@ -7236,17 +7342,17 @@ "İsteğe göre uyarlanmış saat biçimi geçersiz ya da desteklenmeyen biçim " "karakterleri içeriyor." -#: ../../locales/../src/engine/transfersocket.cpp:164 +#: ../../locales/../src/engine/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:2895 -#: ../../locales/../src/interface/edithandler.cpp:1553 +#: ../../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 "Metin dosyaları için varsayılan düzenleyici bulunamadı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2888 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, c-format msgid "The default editor for text files is '%s'." msgstr "Metin dosyaları için varsayılan düzenleyici: '%s'." @@ -7257,13 +7363,13 @@ 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/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 "Dosya uzantısı '%s' zaten listede var" -#: ../../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" @@ -7272,8 +7378,8 @@ "%s adında bir dosya zaten var.\n" "Lütfen yeni bir ad yazın:" -#: ../../locales/../src/interface/edithandler.cpp:1664 -#: ../../locales/../src/interface/LocalListView.cpp:1719 +#: ../../locales/../src/interface/edithandler.cpp:1621 +#: ../../locales/../src/interface/LocalListView.cpp:1704 #, c-format msgid "" "The file '%s' cannot be opened:\n" @@ -7284,18 +7390,27 @@ "İlişkilendirilmiş (%s) programı bulunamadı.\n" "Dosya tipi ilişkilendirmelerinizi denetleyin." -#: ../../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' 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 #, 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:40 +#: ../../locales/../src/interface/xmlfunctions.cpp:42 #, c-format msgid "The file '%s' could not be loaded." msgstr "'%s' dosyası yüklenemedi." -#: ../../locales/../src/interface/edithandler.cpp:1659 -#: ../../locales/../src/interface/LocalListView.cpp:1715 +#: ../../locales/../src/interface/edithandler.cpp:1616 +#: ../../locales/../src/interface/LocalListView.cpp:1700 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7304,8 +7419,8 @@ "'%s' dosyası açılamıyor:\n" "Sisteminizde bu dosya tipi ile ilişkilendirilmiş bir program yok." -#: ../../locales/../src/interface/edithandler.cpp:1753 -#: ../../locales/../src/interface/LocalListView.cpp:1727 +#: ../../locales/../src/interface/edithandler.cpp:1733 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7314,20 +7429,20 @@ "'%s' dosyası açılamıyor:\n" "İlişkilendirilmiş komut yürütülemedi." -#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268 +#: ../../locales/../src/interface/import.cpp:57 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:757 #, 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' dosyası FilzeZilla tarafından desteklenen bir biçimde değil.\n" -"Ayrıca dosya parola ile korunmuş. FileZilla henüz parola korumalı anahtar " -"dosyalarını desteklemiyor.\n" -"Dosyayı desteklenen korumasız biçime dönüştürmek ister misiniz?" +"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' dosyası eski bir FileZilla sürümü ile oluşturulmuş.\n" +"Bu dosyaların yeni sürümler tarafından yüklenmesi veri kaybına neden " +"olabilir.\n" +"Devam etmek ister misiniz?" -#: ../../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" @@ -7336,22 +7451,11 @@ "'%s' dosyası FileZilla tarafından desteklenen bir biçimde değil.\n" "Dosyayı desteklenen bir biçime dönüştürmek ister misiniz?" -#: ../../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' dosyası parola ile korunmuş. FileZilla henüz parola korumalı anahtar " -"dosyalarını desteklemiyor.\n" -"Dosyayı desteklenen korumasız biçime dönüştürmek ister misiniz?" - #: ../../locales/../src/interface/settings/optionspage_edit.cpp:87 msgid "The file selected as default editor does not exist." msgstr "Varsayılan olarak seçilmiş düzenleyici bulunamadı." -#: ../../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" @@ -7365,11 +7469,11 @@ "kullanıcı adı ve parola bilgileri alınacak.\n" "Almaya devam etmek istiyor musunuz?" -#: ../../locales/../src/interface/listctrlex.cpp:755 +#: ../../locales/../src/interface/listctrlex.cpp:756 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:805 +#: ../../locales/../src/interface/listctrlex.cpp:809 msgid "The filename column cannot be hidden." msgstr "Dosya adı sütunu gizlenemez." @@ -7383,46 +7487,56 @@ msgid "The following characters will be replaced: %s" msgstr "Değiştirilecek karakterler: %s" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1888 +#: ../../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:3263 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Ücretsiz açık kaynak kodlu FTP çözümü" -#: ../../locales/../src/interface/bookmarks_dialog.cpp:293 +#: ../../locales/../src/interface/bookmarks_dialog.cpp:285 msgid "The global bookmarks could not be saved." msgstr "Küresel yer imleri kaydedilemedi." -#: ../../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 " "performance." msgstr "" -"Hata ayıklama düzeyi yükseldikçe ileti günlüğünde daha fazla bilgi " -"görüntülenir. Hata ayıklama bilgilerinin ayrıntılı olarak görüntülenmesi " -"başarımı düşürür." +"Hata ayıklama düzeyi yükseldikçe günlüğe daha fazla bilgi yazılır. Hata " +"ayıklama bilgilerinin görüntülenmesi başarımı düşürür." #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78 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:275 +#: ../../locales/../src/interface/state.cpp:973 +#, c-format +msgid "The local directory '%s' could not be created." +msgstr "'%s' yerel klasörü oluşturulamadı." + +#: ../../locales/../src/interface/state.cpp:958 +#, c-format +msgid "The local directory '%s' does not exist." +msgstr "'%s' yerel klasörü bulunamadı." + +#: ../../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 "" -"'%s' yerel klasörü (%s) eşleştirme kökünün altında değil.\n" +"'%s' yerel klasörü (%s) eşitleme kökünün altında değil.\n" "Eşzamanlı tarama devre dışı bırakılıp yerel klasör değiştirilsin mi?" -#: ../../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 "En küçük kapı, en büyük kapı sayısından küçük ya da eşit olmalı." +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 msgid "The new version could not be downloaded, please retry later." @@ -7432,11 +7546,16 @@ 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:1878 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Kuyruk kaydedilemedi." -#: ../../locales/../src/interface/state.cpp:983 +#: ../../locales/../src/interface/state.cpp:885 +#, c-format +msgid "The remote directory '%s' does not exist." +msgstr "'%s' uzak klasörü bulunamadı." + +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7445,28 +7564,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:66 +#: ../../locales/../src/interface/import.cpp:76 msgid "The selected categories have been imported." msgstr "Seçilen kategoriler alındı." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1603 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1618 msgid "" "The selected file contains importable data for the following categories:" -msgstr "Seçilen dosya şu kategoriler için alınabilir veriler içeriyor:" +msgstr "Seçilen dosyada şu kategoriler için alınabilecek veriler var:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1767 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1834 +#: ../../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 "Seçilen dosya zaten düzenleniyor:" -#: ../../locales/../src/interface/edithandler.cpp:1740 +#: ../../locales/../src/interface/edithandler.cpp:1720 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:1669 +#: ../../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" @@ -7476,15 +7595,15 @@ "Bu işlem tehlikeli olabilir ve sisteminize zarar verebilir.\n" "Devam etmek istediğinize gerçekten emin misiniz?" -#: ../../locales/../src/interface/sitemanager.cpp:605 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Sunucu eklenemedi." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Sunucu anlaşılamayan bir yanıt verdi." -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:456 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:505 msgid "The server uses following charset encoding for filenames:" msgstr "Sunucu dosya adları için şu karakter seti kullanılsın:" @@ -7496,7 +7615,7 @@ "Sunucu sertifikası tanınmıyor. Lütfen sunucunun güvenilir olup olmadığını " "anlamak için sertifikayı dikkatle inceleyin." -#: ../../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 " @@ -7506,7 +7625,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: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." @@ -7514,11 +7633,11 @@ "Sunucunun anahtarı bilinmiyor. Bu sunucunun, olmasını beklediğiniz " "bilgisayar olduğunun bir garantisi yok." -#: ../../locales/../src/engine/socket.cpp:1189 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "ai_socktype için servname parametresi desteklenmiyor" -#: ../../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." @@ -7526,19 +7645,19 @@ "Ayarlar alındı. Bütün ayarların etkin olabilmesi için FileZilla yeniden " "başlatılmalı." -#: ../../locales/../src/engine/socket.cpp:1138 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Belirtilen adres ailesi desteklenmiyor" -#: ../../locales/../src/engine/socket.cpp:1202 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Belirtilen ağ adı artık kullanılmıyor" -#: ../../locales/../src/interface/QueueView.cpp:3124 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3120 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "İptal düğmesine tıklamazsanız sistem birazdan kapanacak." @@ -7550,11 +7669,11 @@ "Hedef dosya zaten var.\n" "Lütfen bir işlem seçin:" -#: ../../locales/../src/interface/netconfwizard.cpp:864 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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:76 +#: ../../locales/../src/interface/xmlfunctions.cpp:78 #, c-format msgid "The valid backup file %s could not be restored" msgstr "%s geçerli yedek dosyası geri yüklenemedi" @@ -7563,15 +7682,15 @@ msgid "Themes" msgstr "Temalar" -#: ../../locales/../src/interface/filter.cpp:445 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Bu süzme seti silinemiyor." -#: ../../locales/../src/interface/filter.cpp:385 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Bu süzme seti yeniden adlandırılamaz." -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7594,42 +7713,39 @@ "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:1191 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Saat" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1520 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1539 msgid "Time formatting" -msgstr "Saat biçimi" +msgstr "Saat Biçimi" #: ../../locales/../src/interface/resources/xrc/settings.xrc:96 msgid "Time&out in seconds:" msgstr "Zaman &aşımı (saniye):" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:381 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" -msgstr "Zaman aşımı" +msgstr "Zaman Aşımı" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1667 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format -msgid "" -"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d " -"seconds." -msgstr "" -"Saat dilimi farkı: Sunucu: %d saniye. Yerel: %d saniye. Fark: %d saniye." +msgid "Timezone offset of server is %d seconds." +msgstr "Sunucunun saat dilimi farkı %d saniye." -#: ../../locales/../src/interface/verifycertdialog.cpp:189 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Başlık:" -#: ../../locales/../src/interface/Mainfrm.cpp:2243 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2244 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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." @@ -7651,8 +7767,8 @@ "Green: File is newer than the unmarked file on other side\n" "Red: File sizes different" msgstr "" -"Klasör karşılaştırmasını değiştirir. Karşılaştırma kipini değiştirmek için " -"sağ tıklayın.\n" +"Klasör karşılaştırmasını değiştirir. Karşılaştırma kipini seçmek için sağ " +"tıklayın.\n" "\n" "Renkler:\n" "Sarı: Dosya yalnızca bir tarafta var\n" @@ -7665,55 +7781,55 @@ "If enabled, navigating the local directory hierarchy will also change the " "directory on the server accordingly and vice versa." msgstr "" -"Eşzamanlı tarama.\n" -"Etkinleştirildiğinde yerel klasör ağacında yapılan yer değiştirmeler sunucu " -"klasör ağacında da aynen yapılır." +"Eşzamanlı taramayı etkinleştirir ya da devre dışı bırakır.\n" +"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 msgid "Toggles processing of the transfer queue" -msgstr "Kuyruktaki aktarımları başlatın/durdurun" +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 msgid "Toggles the display of the local directory tree" -msgstr "Yerel klasör ağacını gösterin/gizleyin" +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 msgid "Toggles the display of the message log" -msgstr "İleti kaydını gösterin/gizleyin" +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 msgid "Toggles the display of the remote directory tree" -msgstr "Uzak klasör ağacını gösterin/gizleyin" +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 msgid "Toggles the display of the transfer queue" -msgstr "Aktarım kuyruğunu gösterin/gizleyin" +msgstr "Aktarım kuyruğunu görüntüler ya da gizler" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:574 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Üst bilgi satırı çok uzun" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:649 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Çok fazla yönlendirme" -#: ../../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:289 +#: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" msgstr "Yol İzlensin:" -#: ../../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 "Aktarılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2188 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2213 msgid "Transfer &direction" msgstr "Aktarım &yönü" @@ -7725,25 +7841,25 @@ msgid "Transfer Mode" msgstr "Aktarım Kipi" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1392 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1411 msgid "Transfer Queue" msgstr "Aktarım Kuyruğu" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:376 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:425 msgid "Transfer Settings" msgstr "Aktarım Ayarları" -#: ../../locales/../src/engine/transfersocket.cpp:489 -#: ../../locales/../src/engine/transfersocket.cpp:511 +#: ../../locales/../src/engine/transfersocket.cpp:448 +#: ../../locales/../src/engine/transfersocket.cpp:470 #, c-format msgid "Transfer connection interrupted: %s" msgstr "Aktarım bağlantısı kesildi: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Aktarılan veri bozuldu." -#: ../../locales/../src/interface/queue.cpp:391 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Aktarılıyor" @@ -7752,100 +7868,99 @@ msgid "Transfers" msgstr "Aktarım" -#: ../../locales/../src/interface/QueueView.cpp:3020 -#: ../../locales/../src/interface/QueueView.cpp:3023 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Aktarımlar tamamlandı" -#: ../../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 "Uzantısı &olmayan dosyalar ASCII olarak kabul edilsin" -#: ../../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 "Şu dosya türleri ASCII &olarak algılansın:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Değiştirilmiş sunucu anahtarına güvenilsin:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:806 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Yeni sunucu anahtarına güvenilsin:" -#: ../../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 "Yeni anahtara güvenilerek bağlantı kurulsun mu?" -#: ../../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 "Sertifikaya güvenilip bağlanmaya devam edilsin mi?" -#: ../../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 "Bu sunucuya güvenilip bağlantı kurulsun mu?" #: ../../locales/../src/interface/resources/xrc/update.xrc:122 #: ../../locales/../src/interface/resources/xrc/update.xrc:197 msgid "Try again" -msgstr "Yeniden deneyin" +msgstr "Yeniden dene" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2568 -#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2593 +#: ../../locales/../src/interface/edithandler.cpp:1085 msgid "Type" msgstr "Tip" #: ../../locales/../src/interface/resources/xrc/settings.xrc:453 msgid "Type of FTP Proxy:" -msgstr "FTP vekil sunucu tipi:" +msgstr "FTP Vekil Sunucu Tipi:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:695 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:714 msgid "Type of generic proxy:" -msgstr "Genel vekil sunucu tipi:" +msgstr "Genel Vekil Sunucu Tipi:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1915 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1930 msgid "U&pload" -msgstr "Karşıya Yü&kleyin" +msgstr "Yü&kle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3543 -#: ../../locales/../src/interface/resources/xrc/settings.xrc:911 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3580 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:930 msgid "U&pload limit:" -msgstr "&Karşıya yükleme sınırı:" +msgstr "Yü&kleme sınırı:" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1933 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1952 msgid "U&se filetype associations if available" msgstr "Var&sa dosya ilişkilendirmeleri kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1526 -msgid "U&se system defaults" -msgstr "Sistem var&sayılanları kullanılsın" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 +msgid "U&se system defaults for current language" +msgstr "Geçerli dil için &sistem varsayılanları kullanılsın" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "KULLANICI@&SUNUCU" -#: ../../locales/../src/engine/proxy.cpp:376 -#: ../../locales/../src/engine/proxy.cpp:510 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Atanmamış hata kodu %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:188 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Birim:" -#: ../../locales/../src/interface/edithandler.cpp:1134 -#: ../../locales/../src/interface/edithandler.cpp:1162 +#: ../../locales/../src/interface/edithandler.cpp:1117 +#: ../../locales/../src/interface/edithandler.cpp:1145 msgid "Unknown" msgstr "Bilinmeyen" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:687 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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ı " "yürütülemedi." -#: ../../locales/../src/engine/proxy.cpp:426 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Bilinmeyen SOCKS iletişim kuralı sürümü: %d" @@ -7854,20 +7969,11 @@ msgid "Unknown certificate" msgstr "Bilinmeyen sertifika" -#: ../../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 "" -"Dosya açılırken bilinmeyen bir hata oluştu. Dosyanın erişilebilir ve uygun " -"şekilde düzenlenmiş bir XML belgesi olduğuna emin olun." - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:809 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:825 msgid "Unknown host key" msgstr "Bilinmeyen sunucu anahtarı" -#: ../../locales/../src/engine/proxy.cpp:435 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7875,136 +7981,136 @@ msgstr "" "SOCKS Kullanıcı Adı/Parola iletişiminde bilinmeyen iletişim kuralı sürümü: %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 "" "Bilinmeyen kök nesnesine rastlandı. Bu dosya FileZilla tarafından " "üretilmemiş gibi görünüyor." -#: ../../locales/../src/interface/netconfwizard.cpp:612 -#: ../../locales/../src/interface/netconfwizard.cpp:623 +#: ../../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 "" "Bu sorunlar çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir." -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../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 "" "Bu sorun çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir." -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Sertifika tipi desteklenmiyor" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:634 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Yönlendirme desteklenmiyor" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1921 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1936 msgid "Up&load and unedit" -msgstr "Karşıya yük&leyin ve kapatın" +msgstr "Yük&le ve kapat" #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:45 #: ../../locales/../src/interface/settings/settingsdialog.cpp:112 msgid "Updates" msgstr "Güncelleme" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2202 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2227 msgid "Upload" -msgstr "Karşıya Yükleyin" +msgstr "Yükleme" -#: ../../locales/../src/interface/edithandler.cpp:1125 +#: ../../locales/../src/interface/edithandler.cpp:1108 msgid "Upload failed" -msgstr "Karşıya yüklenemedi" +msgstr "Yüklenemedi" -#: ../../locales/../src/interface/statusbar.cpp:584 +#: ../../locales/../src/interface/statusbar.cpp:586 #, c-format msgid "Upload limit: %s/s" -msgstr "Karşıya yükleme sınırı: %s/s" +msgstr "Yükleme sınırı: %s/s" -#: ../../locales/../src/interface/statusbar.cpp:586 +#: ../../locales/../src/interface/statusbar.cpp:588 msgid "Upload limit: none" -msgstr "Karşıya yükleme sınırı: yok" +msgstr "Yükleme sınırı: yok" -#: ../../locales/../src/interface/resources/xrc/menus.xrc:544 +#: ../../locales/../src/interface/resources/xrc/menus.xrc:548 msgid "Upload selected directory" -msgstr "Seçili klasörü karşıya yükleyin" +msgstr "Seçili klasörü yükle" #: ../../locales/../src/interface/resources/xrc/menus.xrc:242 msgid "Upload selected files and directories" -msgstr "Seçili dosya ve klasörleri karşıya yükleyin" +msgstr "Seçili dosya ve klasörleri yükle" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1726 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1741 msgid "Upload this file back to the server?" msgstr "Bu dosya sunucuya geri yüklensin mi?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1721 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1736 msgid "Upload this file to the server?" msgstr "Bu dosya sunucuya yüklensin mi?" -#: ../../locales/../src/interface/edithandler.cpp:1119 -#: ../../locales/../src/interface/edithandler.cpp:1153 -#: ../../locales/../src/interface/edithandler.cpp:1318 +#: ../../locales/../src/interface/edithandler.cpp:1102 +#: ../../locales/../src/interface/edithandler.cpp:1136 +#: ../../locales/../src/interface/edithandler.cpp:1292 msgid "Uploading" msgstr "Yükleniyor" -#: ../../locales/../src/interface/edithandler.cpp:1122 -#: ../../locales/../src/interface/edithandler.cpp:1320 +#: ../../locales/../src/interface/edithandler.cpp:1105 +#: ../../locales/../src/interface/edithandler.cpp:1294 msgid "Uploading and pending removal" -msgstr "Karşıya yükleniyor ve silinmesi bekleniyor" +msgstr "Yükleniyor ve silinmesi bekleniyor" -#: ../../locales/../src/interface/edithandler.cpp:1156 -#: ../../locales/../src/interface/edithandler.cpp:1322 +#: ../../locales/../src/interface/edithandler.cpp:1139 +#: ../../locales/../src/interface/edithandler.cpp:1296 msgid "Uploading and unediting" -msgstr "Karşıya yüklenip kapatılıyor" +msgstr "Yüklenip kapatılıyor" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:479 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:528 msgid "Use &custom charset" msgstr "Özel &karakter seti kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1897 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1916 msgid "Use &custom editor:" msgstr "Şu özel &düzenleyici kullanılsın:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2882 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 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:2672 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2746 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2697 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Eş&zamanlı tarama kullanılsın" -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:467 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:516 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." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1389 -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1412 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1404 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1427 msgid "Use default action" msgstr "Varsayılanı işlem kullanılsın" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:527 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:538 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:2307 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2332 msgid "Use server currently connected to" msgstr "Şu anda bağlı olan sunucu kullanılsın" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2313 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2338 msgid "Use server from site manager" msgstr "Site yöneticisindeki sunucu kullanılsın" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1477 -msgid "Use system &defaults" -msgstr "Sistem &varsayılanları kullanılsın" +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 +msgid "Use system &defaults for current language" +msgstr "Geçerli dil için sistem &varsayılanları kullanılsın" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8023,7 +8129,8 @@ msgid "" "Use this if you're behind a router and have a static external IP address." msgstr "" -"Bir yönelticinin arkasında ve sabit bir dış IP adresiniz varsa bunu seçin." +"Bir yönelticinin arkasındaysanız ve sabit bir dış IP adresiniz varsa bu " +"seçeneği işaretleyin." #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:240 msgid "" @@ -8040,17 +8147,12 @@ msgid "User:" msgstr "Kullanıcı:" -#: ../../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:1044 msgid "Username cannot be a series of spaces" msgstr "Kullanıcı adı bir dizi boşluk olamaz" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 -#, c-format -msgid "Using proxy %s" -msgstr "%s vekil sunucusu kullanılıyor" - -#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:507 +#: ../../locales/../src/interface/resources/xrc/sitemanager.xrc:556 msgid "" "Using the wrong charset can result in filenames not displaying properly." msgstr "" @@ -8058,40 +8160,34 @@ "açabilir." #: ../../locales/../src/interface/resources/xrc/certificate.xrc:49 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:314 msgid "Valid from:" msgstr "Geçerlilik Başlangıcı:" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:57 -#: ../../locales/../src/interface/resources/xrc/certificate.xrc:322 msgid "Valid to:" msgstr "Geçerlilik Sonu:" #: ../../locales/../src/interface/cmdline.cpp:17 msgid "Verbose log messages from wxWidgets" -msgstr "Ayrıntılı wxWidgets günlük iletileri" +msgstr "Günlüğe wxWidgets kayıtları da yazılsın" -#: ../../locales/../src/engine/tlssocket.cpp:1096 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Sertifika doğrulanıyor..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:757 -msgid "Version:" -msgstr "Sürüm:" - -#: ../../locales/../src/interface/resources/xrc/settings.xrc:945 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:964 msgid "Very high" msgstr "Çok yüksek" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1406 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "Gizli dosyalar görüntülensin seçili, ama sunucu desteklemiyor" -#: ../../locales/../src/interface/resources/xrc/settings.xrc:1805 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1824 msgid "View/Edit" msgstr "Görüntülensin/Düzenlensin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2104 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2129 msgid "Visible columns" msgstr "Görüntülenecek sütunlar" @@ -8099,15 +8195,15 @@ msgid "W&rite" msgstr "Y&azma" -#: ../../locales/../src/interface/QueueView.cpp:1713 +#: ../../locales/../src/interface/QueueView.cpp:1665 msgid "Waiting" msgstr "Bekliyor" -#: ../../locales/../src/interface/queue.cpp:387 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Tarama bağlantısı için bekliyor" -#: ../../locales/../src/interface/queue.cpp:388 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Parola yazmanız bekleniyor" @@ -8115,42 +8211,11 @@ msgid "Waiting for transfer to be cancelled" msgstr "Aktarımın iptal edilmesi bekleniyor" -#: ../../locales/../src/engine/engineprivate.cpp:216 +#: ../../locales/../src/engine/engineprivate.cpp:229 msgid "Waiting to retry..." msgstr "Yeniden denemek için bekleniyor..." -#: ../../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 "" -"Dikkat!\n" -"\n" -"Windowsdaki bir hata Filezilla için sorun yaratıyor\n" -"\n" -"Hata şu durumlarda oluşuyor\n" -"- Windows Server 2003 ya da XP 64 kullanıyorsanız\n" -"- Windows Firewall etkin ise\n" -"- Uygulama Katmanı Ağ Geçidi hizmeti etkinse\n" -"Daha fazla bilgi için http://support.microsoft.com/kb/931130 makalesine " -"bakın.\n" -"\n" -"Windows Firewal ya da Uygulama Katmanı Ağ geçidi hizmetini devre dışı " -"bırakmadan,\n" -"FileZilla büyük dosyaları aktarırken zaman aşımına uğrayacaktır." - -#: ../../locales/../src/interface/netconfwizard.cpp:981 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Uyarı, yanlış IP adresinden yapılan veri bağlantısı yok sayılıyor." @@ -8168,15 +8233,15 @@ "\n" "Gerçekten gecelik yapımların denetlenmesini istiyor musunuz?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:927 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:943 msgid "Warning: Potential security breach!" msgstr "Dikkat: Olası güvenlik ihlali!" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3427 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "FileZilla Yazılımına Hoş Geldiniz" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Yenilikler:" @@ -8184,7 +8249,7 @@ msgid "What's new:" msgstr "Yenilikler:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3617 +#: ../../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." @@ -8192,7 +8257,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: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." @@ -8200,36 +8265,36 @@ "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:1356 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1375 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:1268 +#: ../../locales/../src/interface/resources/xrc/settings.xrc:1287 msgid "Widescreen" msgstr "Geniş Ekran" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3612 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3649 msgid "Would you like FileZilla to remember passwords?" -msgstr "Parola hatırlamayı etkinleştirmek ister misiniz?" +msgstr "Parolalar hatırlansın mı?" #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:483 msgid "Wr&ite" msgstr "Ya&zma" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Dış IP adresi yanlış" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:797 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Satır sonu yanlış" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:820 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Evet" -#: ../../locales/../src/interface/netconfwizard.cpp:783 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8241,7 +8306,7 @@ 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:3402 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 msgid "You can always open this dialog again through the help menu." msgstr "Bu pencereyi yardım menüsünden açabilirsiniz" @@ -8272,18 +8337,18 @@ "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:296 +#: ../../locales/../src/interface/asyncrequestqueue.cpp:301 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:3181 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 msgid "You have selected at least one symbolic link." msgstr "En az bir sembolik bağlantı seçmelisiniz." -#: ../../locales/../src/interface/edithandler.cpp:1630 -#: ../../locales/../src/interface/search.cpp:739 +#: ../../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?" @@ -8291,7 +8356,7 @@ "Düzenleme için 10 taneden fazla dosya seçtiniz. Bunu gerçekten yapmak " "istiyor musunuz?" -#: ../../locales/../src/interface/LocalListView.cpp:1685 +#: ../../locales/../src/interface/LocalListView.cpp:1670 msgid "" "You have selected more than 10 files or directories to open, do you really " "want to continue?" @@ -8299,35 +8364,39 @@ "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:433 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:943 +#: ../../locales/../src/interface/manual_transfer.cpp:415 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Bir sunucu adı yazmalısınız." -#: ../../locales/../src/interface/search.cpp:510 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063 +msgid "You have to enter a key file path" +msgstr "Bir anahtar dosyası yolu yazmalısınız" + +#: ../../locales/../src/interface/search.cpp:524 msgid "You have to enter a local directory." msgstr "Yerel bir klasör yazmalısınız." -#: ../../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 "Geçerli bir IP adresi yazmalısınız." +#: ../../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 "Geçerli bir IPv4 adresi yazmalısınız." -#: ../../locales/../src/interface/search.cpp:516 +#: ../../locales/../src/interface/search.cpp:529 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:529 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1043 +#: ../../locales/../src/interface/manual_transfer.cpp:506 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 msgid "You have to enter an account name" msgstr "Bir hesap adı yazmalısınız" -#: ../../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:1029 msgid "You have to specify a user name" msgstr "Bir kullanıcı adı yazmalısınız" -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8343,7 +8412,7 @@ 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:1509 +#: ../../locales/../src/interface/edithandler.cpp:1472 msgid "You need to enter a properly quoted command." msgstr "Uygun şekilde düzenlenmiş bir komut yazmalısınız." @@ -8356,15 +8425,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: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:1127 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: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:1134 msgid "" "You need to enter both a local and a remote path to enable synchronized " "browsing for this bookmark." @@ -8372,7 +8441,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:1065 +#: ../../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." @@ -8380,23 +8449,23 @@ "Bu sitede eşzamanlı taramayı etkinleştirmek için yerel ve uzak klasörleri " "yazmalısınız." -#: ../../locales/../src/interface/manual_transfer.cpp:316 +#: ../../locales/../src/interface/manual_transfer.cpp:303 msgid "You need to specify a local file." msgstr "Yerel bir dosya belirtmelisiniz" -#: ../../locales/../src/interface/manual_transfer.cpp:336 +#: ../../locales/../src/interface/manual_transfer.cpp:320 msgid "You need to specify a remote file." msgstr "Uzaktaki bir dosyayı belirtmelisiniz." -#: ../../locales/../src/interface/manual_transfer.cpp:343 +#: ../../locales/../src/interface/manual_transfer.cpp:326 msgid "You need to specify a remote path." msgstr "Uzaktaki bir bağlantı yolunu belirtmelisiniz." -#: ../../locales/../src/interface/manual_transfer.cpp:309 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Bir sunucu belirtmelisiniz." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8404,66 +8473,66 @@ "Diğer sunuculara bağlanmakta bir sorununuz olmamalı. Dosya aktarımları " "düzgün çalışıyor olmalı." -#: ../../locales/../src/interface/QueueView.cpp:3128 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." -msgstr "İptel düğmesine tıklamazsanız sistem askıya alınacak." +msgstr "İptal düğmesine tıklamazsanız sistem askıya alınacak." #: ../../locales/../src/interface/filter_conditions_dialog.cpp:125 msgid "after" -msgstr "sonra" +msgstr "şundan sonra olan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:122 msgid "before" -msgstr "önce" +msgstr "şundan önce olan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:92 msgid "begins with" -msgstr "şununla başlayan:" +msgstr "şununla başlayan" #: ../../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 "bayt" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:90 msgid "contains" -msgstr "içeren" +msgstr "şunu içeren" -#: ../../locales/../src/interface/updater.cpp:211 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "özel" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:95 msgid "does not contain" -msgstr "içermeyen" +msgstr "şunu içermeyen" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:99 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:124 msgid "does not equal" -msgstr "eşit olmayan" +msgstr "şuna eşit olmayan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:93 msgid "ends with" -msgstr "şununla biten:" +msgstr "şununla biten" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:98 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:123 msgid "equals" -msgstr "eşittir" +msgstr "şuna eşit olan" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "dosya" -#: ../../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: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 " @@ -8473,17 +8542,21 @@ "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:1471 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 +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 msgid "fzsftp could not be started" msgstr "fzsftp başlatılamıyor" -#: ../../locales/../src/engine/tlssocket.cpp:1051 +#: ../../locales/../src/engine/tlssocket.cpp:1127 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 msgid "greater than" -msgstr "büyük" +msgstr "şundan büyük olan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:117 msgid "group executable" @@ -8497,13 +8570,13 @@ msgid "group writeable" msgstr "grup yazabilir" -#: ../../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" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:91 msgid "is equal to" -msgstr "eşit" +msgstr "şuna eşit olan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:102 msgid "is set" @@ -8515,11 +8588,11 @@ #: ../../locales/../src/interface/filter_conditions_dialog.cpp:100 msgid "less than" -msgstr "küçük" +msgstr "şundan küçük olan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:94 msgid "matches regex" -msgstr "kurallı ifadelere uyan" +msgstr "şu kurallı ifadeye uyan" #: ../../locales/../src/interface/filter_conditions_dialog.cpp:114 msgid "owner executable" @@ -8533,10 +8606,11 @@ msgid "owner writeable" msgstr "sahibi yazabilir" -#: ../../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: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 "bilinmeyen" @@ -8555,6 +8629,3 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:708 msgid "wxWidgets:" msgstr "wxWidgets:" - -#~ msgid "(%u%% downloaded)" -#~ msgstr "(%u%% indirildi)" diff -Nru filezilla-3.14.1/locales/uk_UA.po filezilla-3.15.0.2/locales/uk_UA.po --- filezilla-3.14.1/locales/uk_UA.po 2015-09-16 12:05:46.000000000 +0000 +++ filezilla-3.15.0.2/locales/uk_UA.po 2016-02-05 08:54:45.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: FileZilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-16 10:03+0200\n" -"PO-Revision-Date: 2015-09-12 01:44+0300\n" +"POT-Creation-Date: 2016-01-30 15:29+0100\n" +"PO-Revision-Date: 2016-01-24 12:24+0300\n" "Last-Translator: Igor Chomko \n" "Language-Team: Igor Chomko \n" "Language: uk_UA\n" @@ -51,9 +51,9 @@ msgstr[1] "%d каталоги" msgstr[2] "%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" @@ -63,9 +63,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" @@ -89,12 +89,12 @@ msgstr[1] "%d файли. Загальний розмір: Принаймні %s" msgstr[2] "%d файлів. Загальний розмір: Принаймні %s" -#: ../../locales/../src/interface/QueueView.cpp:2781 +#: ../../locales/../src/interface/QueueView.cpp:2772 #, 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" @@ -137,7 +137,7 @@ msgid "%s (? B/s)" msgstr "%s (? Б/с)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Дія сертифікату вичерпана!" @@ -170,7 +170,7 @@ msgstr[1] "%s байти" msgstr[2] "%s байт" -#: ../../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 " @@ -184,7 +184,7 @@ "Завантажте 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 " @@ -201,7 +201,7 @@ "змінної середовища.\n" "- Встановіть повний шлях до %s у змінній середовища FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" msgstr "%s з %d бітами" @@ -215,7 +215,7 @@ msgid "%w - Proxy password" msgstr "%w - Пароль проксі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "&Завершити попереднє з'єднання і з'єднати у поточній вкладці" @@ -268,7 +268,7 @@ msgid "&Always use default editor" msgstr "&Завжди використовувати типовий редактор" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 msgid "&Always use selection for unassociated files" msgstr "&Завжди використовувати вибране для неасоційованих файлів" @@ -307,9 +307,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 @@ -322,8 +322,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" @@ -396,14 +396,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 "&Видалити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Видалити символічне посилання" @@ -411,14 +411,14 @@ msgid "&Directory comparison" msgstr "&Порівняння каталогів" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "" "&Вимкнути синхронізований перегляд і продовжити змінювання локального " "каталогу" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "" @@ -447,7 +447,7 @@ msgid "&Display size in bytes" msgstr "&Показати розмір в байтах" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "&Не пам'ятати паролів (рекомендовано)" @@ -468,7 +468,7 @@ msgid "&Download" msgstr "&Завантажити" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "&Завантажити до:" @@ -501,7 +501,7 @@ msgid "&Enable compression" msgstr "&Увімкнути стиснення даних" -#: ../../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 "&Увімкнути обмеження швидкості" @@ -518,7 +518,7 @@ msgid "&Enter custom command..." msgstr "&Ввести настроювану команду..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Встановити з'єднання у новій вкладці" @@ -571,7 +571,7 @@ msgid "&Finish editing and delete local file" msgstr "&Завершити редагування і видалити локальний файл" -#: ../../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" @@ -579,7 +579,7 @@ "&Вирівняти віддалені шляхи, завантажити усі вміщені файли прямо до кінцевого " "каталогу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Відстежити символічне посилання, видалити вміст кінцевого каталогу" @@ -642,7 +642,7 @@ msgid "&Install new version" msgstr "&Встановити нову версію" -#: ../../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 "" "&Утримувати структуру віддаленого шляху відносно кореневої папки пошуку" @@ -668,7 +668,7 @@ msgstr "&Локальне дерево каталогів" #: ../../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 "&Локальний каталог:" @@ -732,11 +732,11 @@ msgid "&New Site" msgstr "&Новий сайт" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "&Доступна нова версія!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Далі>" @@ -759,7 +759,7 @@ msgstr "&Числове значення:" #: ../../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 "&ДОБРЕ" @@ -836,12 +836,12 @@ msgid "&Remember password until FileZilla is closed" msgstr "&Пам'ятати пароль до завершення роботи FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Віддалений каталог:" @@ -862,7 +862,7 @@ msgstr "&Забрати вибране" #: ../../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 @@ -923,7 +923,7 @@ msgid "&Save as..." msgstr "&Зберегти як..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Пошук" @@ -992,7 +992,7 @@ msgid "&Speed limits" msgstr "&Обмеження швидкості" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "&Розпочати передачу негайно" @@ -1004,7 +1004,7 @@ msgid "&TLS Ciphers" msgstr "&Шифри TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "&Тест" @@ -1047,7 +1047,7 @@ msgid "&Uploads:" msgstr "&Відвантаження:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Використати користувацьку програму" @@ -1081,7 +1081,7 @@ msgid "&Username:" msgstr "&Ім'я користувача:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Версія %s" @@ -1127,13 +1127,13 @@ 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 "" "'Обліковий запис' за типом входження не підтримується вибраним протоколом" -#: ../../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." @@ -1149,7 +1149,7 @@ "Типи входу 'Нормальний' і 'Обліковий запис' відсутні. Ваш вхід було змінено " "на 'Запит паролю'." -#: ../../locales/../src/interface/Mainfrm.cpp:578 +#: ../../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 " @@ -1208,8 +1208,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 @@ -1268,7 +1268,7 @@ msgid "64-bit system" msgstr "64-бітна система" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Назад" @@ -1287,7 +1287,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "Каталог неможливо перетягнути до одного з його підкаталогів." @@ -1314,7 +1314,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 " @@ -1332,7 +1332,7 @@ msgid "A new version of FileZilla is available:" msgstr "Доступна нова версія FileZilla:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1349,7 +1349,7 @@ "Правильно налаштований сервер цього не вимагає. Якщо у вас виникла така " "потреба, контактуйте з адміністратором сервера." -#: ../../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?" @@ -1401,11 +1401,11 @@ #: ../../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: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" @@ -1431,7 +1431,7 @@ msgid "Active mode" msgstr "Активний режим" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1439,7 +1439,7 @@ "FTP тест активного режиму показав збій. FileZilla не знає правильної " "завнішньої ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:607 +#: ../../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." @@ -1447,7 +1447,7 @@ "Невдалий тест активного режиму FTP. FileZilla не знає правильної зовнішньої " "ІР адреси. До того ж, ваш маршрутизатор змінив адресу відправника." -#: ../../locales/../src/interface/netconfwizard.cpp:595 +#: ../../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 " @@ -1461,7 +1461,7 @@ msgid "Active mode IP" msgstr "ІР активного режиму" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Лише додати файли до &черги" @@ -1480,7 +1480,7 @@ msgid "Add to queue" msgstr "Додати до черги" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Тип адреси не підтримується" @@ -1502,7 +1502,7 @@ "давати збої і навіть пошкодити вашу систему. Використовуйте бета версії і " "нічні збірки на власний ризик." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "Зав&жди виконувати цю дію" @@ -1510,7 +1510,7 @@ msgid "Algorithm:" msgstr "Алгоритм:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2937 msgid "All files have been successfully transferred" msgstr "Усі файли були успішно передані" @@ -1519,7 +1519,7 @@ msgstr "" "Усі порти в заданому діапазоні повинні знаходитись в межах від 1024 до 65535." -#: ../../locales/../src/interface/QueueView.cpp:2946 +#: ../../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." @@ -1535,11 +1535,11 @@ 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 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Альтернативне ім'я:" @@ -1570,7 +1570,7 @@ "В якості альтернативи, ви, також, можете завантажити останню версію " "FileZilla з веб сайту:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1902 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1579,7 +1579,7 @@ "Помилка при завантаженні черги передачі з \"%s\".\n" "Деякі елементи черги неможливо відновити." -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1812 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1588,7 +1588,7 @@ "Помилка збереження черги передачі до \"%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." @@ -1597,16 +1597,16 @@ "існує на вказаній позиції." #: ../../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/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:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "" @@ -1616,11 +1616,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 "Внесення будь-яких змін до фільтрів не будуть збережені." @@ -1644,7 +1644,7 @@ msgid "Archive" msgstr "Архів" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Аргумент переповнення буфера" @@ -1662,7 +1662,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Запит на пароль" @@ -1674,7 +1674,7 @@ msgid "Ask your operating system for the external IP address" msgstr "Запит своєї операційної системи про зовнішню ІР адресу" -#: ../../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" @@ -1694,7 +1694,7 @@ msgid "Attribute" msgstr "Атрибут" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Невдала автентифікація." @@ -1723,11 +1723,11 @@ msgid "B&ypass proxy" msgstr "Про&міжний проксі" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Неправильний дескриптор файлу" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Базові інструкції користування" @@ -1740,7 +1740,7 @@ msgid "Being edited" msgstr "В процесі редагування" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Увага! Сертифікат скасовано" @@ -1758,11 +1758,11 @@ 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 "Закладки" @@ -1778,7 +1778,7 @@ msgid "Build information" msgstr "Інформація по конструкції" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "Business category:" msgstr "Бізнес категорія:" @@ -1818,22 +1818,22 @@ msgid "CPU features:" msgstr "Характеристики ЦП" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../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" @@ -1851,13 +1851,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 "Скасувати" @@ -1875,15 +1875,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:561 msgid "Cannot add server to Site Manager" msgstr "Неможливо додати сервер до Сайт Менеджера" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" 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?" @@ -1904,20 +1904,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:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1934,11 +1934,11 @@ msgid "Cannot load key file" msgstr "Неможливо завантажити файл ключа" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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 "Неможливо запам'ятати пароль" @@ -1947,22 +1947,22 @@ 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:172 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "" "Неможливо зіставити ім'я хоста з адресою IPv4 для використання з проксі " "SOCKS4." -#: ../../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 "Неможливо вибрати фільтр" @@ -2029,7 +2029,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 "Подача кодування символів" @@ -2057,7 +2057,7 @@ msgid "Check for updates failed" msgstr "Перевірити невдалі оновлення" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2065,7 +2065,7 @@ "Перевірте свій обліковий запис. Введений пароль починається або закінчується " "пробілом." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2073,7 +2073,7 @@ "Перевірте свій обліковий запис. Введене ім'я користувача починається або " "закінчується пробілом." -#: ../../locales/../src/interface/netconfwizard.cpp:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Перевірка правильності зовнішньої ІР адреси" @@ -2081,12 +2081,12 @@ 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" @@ -2101,11 +2101,11 @@ #: ../../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 "Частину даних завершено неправильно" @@ -2143,7 +2143,7 @@ msgid "Clear quickconnect bar" msgstr "Очистити панель Швидкого З'єднання" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "Щоб зберегти свою конфігурацію натисніть кнопку Завершити." @@ -2160,8 +2160,8 @@ msgstr "Закрити &усі інші вкладки" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Закрити FileZilla" @@ -2189,13 +2189,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:525 msgid "Command not supported" msgstr "Команда не підтримується" @@ -2203,9 +2203,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 "Команда:" @@ -2213,12 +2213,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:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "Зв'язок блокується маршрутизатором або файєрволом" @@ -2266,7 +2266,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 "Умови чутливі до ре&гістру" @@ -2282,24 +2282,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:576 msgid "Congratulations, your configuration seems to be working." msgstr "Вітаємо, Ваша конфігурація виглядає працездатною." @@ -2307,6 +2307,11 @@ msgid "Connect bypassing proxy settings" msgstr "Під'єднати налаштування обхідного проксі" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, c-format +msgid "Connect failed: %s" +msgstr "Невдале з'єднання: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "З'єднати в поточній вкладці" @@ -2319,29 +2324,25 @@ 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:210 #: ../../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 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, c-format msgid "Connecting to %s through %s proxy" msgstr "Під'єднання до %s через проксі %s" -#: ../../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:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "Під'єднання до %s..." @@ -2350,82 +2351,86 @@ msgid "Connection" msgstr "Під'єднання" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" 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:240 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "" "Невдала спроба під'єднання з \"%s\", роблю спробу за наступною адресою." -#: ../../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 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Час спроби з'єднання вичерпано" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 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:220 msgid "Connection closed by server" msgstr "З'єднання завершено сервером" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../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:333 +msgid "Connection established, waiting for welcome message." +msgstr "З'єднання встановлено, очікуємо на запрошення." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "З'єднання встановлено, очікуємо на вітальне повідомлення..." -#: ../../locales/../src/interface/netconfwizard.cpp:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "З'єднання втрачено" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "З'єднання не дозволено встановленими правилами" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "У з'єднанні відмовлено" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "У з'єднанні відмовлено сервером" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "З'єднання скинуте сервером" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" 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" @@ -2433,38 +2438,38 @@ msgstr[1] "Час очікування вичерпано після %d секунд бездіяльності" msgstr[2] "Час очікування вичерпано після %d секунд бездіяльності" -#: ../../locales/../src/interface/netconfwizard.cpp:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 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:249 msgid "Connection with proxy established, performing handshake..." msgstr "З'єднання з проксі встановлено, обмінюємось вітаннями..." -#: ../../locales/../src/interface/netconfwizard.cpp:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "З'єднання з сервером закрилось дочасно." -#: ../../locales/../src/interface/netconfwizard.cpp:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "З'єднання з тестовим сервером невдале." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../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" @@ -2474,7 +2479,7 @@ msgid "Copy the URLs of the selected items to clipboard." msgstr "Копіювати адреси вибраних елементів до буферу обміну." -#: ../../locales/../src/engine/transfersocket.cpp:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Неможливо прийняти з'єднання: %s" @@ -2484,30 +2489,30 @@ msgid "Could not add connection to Site Manager" msgstr "Неможливо додати з'єднання до Сайт Менеджера" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 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 "Неможливо скопіювати адреси" @@ -2515,17 +2520,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 +#: ../../locales/../src/engine/logging.cpp:173 #, c-format msgid "Could not create logging mutex: %s" msgstr "Неможливо створити реєстраційний об’єкт-взаємовиключення: %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" @@ -2536,11 +2541,11 @@ "Або неправильно встановлено розширення оболонки, або ви не помістили файли у " "вікно Провідника." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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 " @@ -2552,11 +2557,11 @@ "командної лінійки '--datadir ' або, встановивши змінну " "середовища FZ_DATADIR ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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" @@ -2564,7 +2569,7 @@ "Неможливо отримати виразного імені сертифікату видавця, невдале " "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" @@ -2572,27 +2577,32 @@ "Неможливо отримати виразне ім'я предмету сертифіката, невдала функція " "gnutls_x509_get_dn" -#: ../../locales/../src/interface/state.cpp:929 +#: ../../locales/../src/interface/state.cpp:923 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" -#: ../../locales/../src/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, 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" @@ -2616,11 +2626,11 @@ 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:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2631,7 +2641,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 " @@ -2642,7 +2652,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 " @@ -2654,14 +2664,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" @@ -2674,42 +2684,50 @@ msgid "Could not parse server address:" msgstr "Неможливо визначити адресу сервера :" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +msgid "Could not read from data socket." +msgstr "Неможливо читати з гнізда даних." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Неможливо читати з гнізда проксі: %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:344 +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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:2624 msgid "Could not spawn IO thread" msgstr "Неможливо створити процес IO" -#: ../../locales/../src/engine/ControlSocket.cpp:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "Неможливо розпочати обмін вітаннями з проксі: %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 "" @@ -2729,7 +2747,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:1841 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2738,9 +2756,9 @@ "Неможливо записати \"%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" @@ -2750,28 +2768,28 @@ msgid "Could not write \"%s\":" msgstr "Неможливо писати \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../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 "Неможливо записати в сокет: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Country:" msgstr "Країна:" @@ -2779,11 +2797,11 @@ msgid "Crea&te new file" msgstr "Створи&ти новий файл" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "Створити &відсутній локальний каталог і увійти до нього" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "Створити &відсутній віддалений каталог і увійти до нього" @@ -2812,45 +2830,45 @@ 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: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:3171 +#: ../../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 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" 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" @@ -2880,7 +2898,7 @@ msgid "Cus&tom" msgstr "Нас&троюваний" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Встановлено настроюваний фільтр" @@ -2909,6 +2927,10 @@ msgid "D&elete" msgstr "Ви&далити" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "П&орівняння каталогів" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Вим&кнути все" @@ -2922,7 +2944,7 @@ msgstr "Дія по&двійного клацання на каталогах:" #: ../../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 "Д&ублювати" @@ -2938,8 +2960,8 @@ msgid "Data" msgstr "Дані" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Сокет даних закрився дуже рано." @@ -3063,19 +3085,11 @@ 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: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 "Робочий стіл" @@ -3097,7 +3111,7 @@ msgid "Dire&ctories" msgstr "Ка&талоги" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Напрямок" @@ -3105,13 +3119,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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "Порівняння каталогів" @@ -3123,11 +3137,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 "Невдалий список каталогів" @@ -3135,12 +3149,12 @@ msgid "Directory listing filters" msgstr "Фільтри списку каталогів" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, c-format msgid "Directory listing of \"%s\" successful" msgstr "Вдалий список каталогів \"%s\"" -#: ../../locales/../src/engine/ControlSocket.cpp:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Вдалий список каталогів" @@ -3148,13 +3162,13 @@ msgid "Disa&ble all" msgstr "Вимк&нути все" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "" "Вимкнути синхронізований перегляд і продовжити зміни у віддаленому каталозі?" -#: ../../locales/../src/interface/Mainfrm.cpp:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3165,23 +3179,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:213 +#: ../../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 "Від'єднати від попереднього сервера" @@ -3207,8 +3221,8 @@ msgid "Do the same with &all selected files already being edited" msgstr "Повторіть дію з &усіма обраними файлами, що уже редагуються" -#: ../../locales/../src/interface/Mainfrm.cpp:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Ви дійсно бажаєте закрити FileZilla?" @@ -3230,7 +3244,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "Ви дійсно бажаєте видалити чергу передач?" -#: ../../locales/../src/interface/Mainfrm.cpp:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "Ви дійсно бажаєте надіслати '%s' до сервера?" @@ -3239,7 +3253,7 @@ msgid "Do you want to reopen this file?" msgstr "Бажаєте повторно відкрити цей файл?" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Документація" @@ -3261,7 +3275,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 "Обмеження &завантаження:" @@ -3275,9 +3289,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 "Завантажити результати пошуку" @@ -3289,7 +3303,7 @@ msgid "Download selected files and directories" msgstr "Завантажити обрані файли і каталоги" -#: ../../locales/../src/interface/Mainfrm.cpp:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3302,26 +3316,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 "" @@ -3331,9 +3337,9 @@ "Функцію Перетягнути&Скинути між різними елементами у 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." @@ -3368,7 +3374,7 @@ msgid "E&xport..." msgstr "Е&кспорт..." -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "E-Mail:" msgstr "Ел. пошта:" @@ -3387,16 +3393,16 @@ "Редагувати файл з відконфігурованим редактором і відвантажити зміни на " "сервер." -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" 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 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Редагування результатів пошуку" @@ -3404,7 +3410,7 @@ msgid "Email:" msgstr "Ел. пошта:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "Empty command" msgstr "Порожня команда" @@ -3412,7 +3418,7 @@ msgid "Empty command." msgstr "Порожня команда." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Порожній список каталогів" @@ -3458,7 +3464,7 @@ msgid "Encryption details" msgstr "Подробиці кодування" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Завершити порівняння та змінити порядок сортування?" @@ -3466,15 +3472,15 @@ msgid "Enter &custom command..." msgstr "Ввести &настроювану команду ..." -#: ../../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:2103 msgid "Enter command" msgstr "Ввести команду" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Ввести настроювану команду" @@ -3488,11 +3494,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 "Ввести нове ім'я для встановленого фільтру" @@ -3533,7 +3539,7 @@ "- ftps:// для FTP через TLS (неявні)\n" "- ftpes:// для FTP через TLS (явні)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3563,7 +3569,7 @@ msgid "Error importing" msgstr "Помилка імпорту" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1903 msgid "Error loading queue" msgstr "Помилка завантаження черги" @@ -3572,50 +3578,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/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: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:939 msgid "Error loading xml file" msgstr "Помилка завантаження файлу xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1813 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: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: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 "Помилка:" @@ -3707,24 +3713,24 @@ 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/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 "Невдале копіювання або переміщення сайтів" @@ -3732,113 +3738,117 @@ msgid "Failed to create backup copy of xml file" msgstr "Невдале створення резервної копії файлу xml" -#: ../../locales/../src/interface/netconfwizard.cpp:802 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "Невдале створення сокету слухання, аварійне завершення" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "Невдале створення сокету слухання для передачі в активному режимі" -#: ../../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:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "" "Невдале отримання адреси вузла кешування контрольного з'єднання, з'єднання " "завершено." -#: ../../locales/../src/interface/netconfwizard.cpp:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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: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:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../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:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "Невдале відкривання \"%s\" для додавання/запису" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, 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:2525 +#: ../../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:1003 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:721 msgid "Failed to retrieve external ip address, aborting" msgstr "Невдале отримання зовнішньої ІР адреси, аварійне завершення" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "Невдале отримання зовнішньої ІР адреси, використовуючи локальну адресу" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3800 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "Невдале отримання локальної ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:706 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "Невдале отримання локальної ІР адреси. Аварійне завершення" -#: ../../locales/../src/interface/netconfwizard.cpp:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "Невдале отримання зовнішньої ІР адреси." -#: ../../locales/../src/interface/netconfwizard.cpp:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 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)." @@ -3846,26 +3856,26 @@ "Невдале встановлення мови на %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, використовується типова мова системи." @@ -3874,11 +3884,11 @@ 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" @@ -3911,7 +3921,7 @@ msgid "File Types" msgstr "Типи файлів" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Дескриптор файлу не сокет" @@ -3923,7 +3933,7 @@ msgid "File editing" msgstr "Редагування файлу" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Файл існує" @@ -3940,8 +3950,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 "Файл не знайдено" @@ -3950,38 +3960,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:1137 msgid "File transfers still in progress." msgstr "Передачі файлів усе ще виконуються." @@ -3993,7 +4003,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" @@ -4007,11 +4017,11 @@ "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:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "" "FileZilla потребує перезавантаження для того, щоб зміни у виборі мови набули " @@ -4027,7 +4037,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 @@ -4038,13 +4048,13 @@ msgid "Filename &filters..." msgstr "Фільтри &імені файлу..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "Для каталогу %s та імені файлу %s неможливо створити ім'я файлу" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Ім'я файлу не дійсне" @@ -4075,7 +4085,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" @@ -4085,7 +4095,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" @@ -4123,8 +4133,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 "Встановлений фільтр вже існує" @@ -4138,11 +4148,11 @@ msgid "Filter validation failed" msgstr "Відмова перевірки достовірності фільтру" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Знайти &файли" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Знайти ка&талоги" @@ -4159,7 +4169,7 @@ msgid "Fingerprint:" msgstr "Ключ шифру:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "Майстер конфігурування файєрволу та маршрутизатора" @@ -4191,7 +4201,7 @@ msgid "Force showing &hidden files" msgstr "Примусити показ &прихованих файлів" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Примусити показ прихованих файлів" @@ -4206,12 +4216,12 @@ "аргументи." #. @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 "Знайдено новий %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Інша документація" @@ -4219,7 +4229,7 @@ msgid "General" msgstr "Загальні" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "Помилка сервера загальних SOCKS" @@ -4232,12 +4242,12 @@ msgid "Get external IP address from the following URL:" msgstr "Отримати зовнішню ІР адресу з наступного URL:" -#: ../../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 "Ім'я встановленого фільтру вже існує, переписати встановлений фільтр?" @@ -4245,22 +4255,22 @@ msgid "Global bookmarks" msgstr "Глобальні закладки" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Помилка GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" 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 "Помилка GnuTLS %d в %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Помилка GnuTLS %d: %s" @@ -4290,17 +4300,17 @@ 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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "Високий" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../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." @@ -4314,7 +4324,7 @@ msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Хост недосяжний" @@ -4330,7 +4340,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "Хост стартує з '[', однак заключної дужки не знайдено." -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Хост недосяжний" @@ -4349,7 +4359,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (приклад: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "Адреси IPv6 не підтримуються через проксі SOCKS4" @@ -4399,7 +4409,7 @@ "Якщо змін в ключі хоста не очікувалось, сконтактуйтесь з адміністратором " "сервера." -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4407,7 +4417,7 @@ "Якщо дана проблема не зникає, - це означає, що якийсь маршрутизатор та/або " "файєрвол продовжує блокувати роботу FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4425,7 +4435,7 @@ "додавання \".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." @@ -4433,7 +4443,7 @@ "Якщо символічне посилання вказує на каталог, FileZilla може як видалити " "символічне посилання, так і вилучити вміст пов'язаного каталогу." -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4441,7 +4451,7 @@ "Якщо дана проблема не зникає, тоді зверніться до виробника вашого " "маршрутизатора або файєрволу у пошуку рішення." -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "" "Якщо дана проблема не зникає, тоді зверніться до виробника вашого " @@ -4478,7 +4488,7 @@ "Якщо ви натисните кнопку тест, FileZilla з'єднається з probe.filezilla-" "project.org і виконає кілька простих тестів." -#: ../../locales/../src/interface/Mainfrm.cpp:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "Якщо ви закриєте FileZilla,ваші зміни будуть втрачені." @@ -4504,7 +4514,7 @@ "Якщо у вас виникають проблеми з отриманням списку каталогів або передачею " "файлів, спробуйте змінити типовий спосіб передачі." -#: ../../locales/../src/interface/netconfwizard.cpp:584 +#: ../../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 " @@ -4539,7 +4549,7 @@ "Якщо ви користуєтесь маршрутизатором, переконайтесь, що усі ці порти " "скеровані до пристрою на якому встановлена ваша копія FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4600,14 +4610,14 @@ "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" msgstr "" "Неповний ланцюг, топ сертифікат не є самопідписаним сертифікатом авторизації" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Неправильний пароль" @@ -4619,17 +4629,21 @@ "Неможливо отримати інформацію про останню версію FileZilla. Спробуйте " "пізніше." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 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:730 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/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Інтерактивний" @@ -4637,29 +4651,29 @@ msgid "Interface" msgstr "Інтерфейс" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" 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 "Недійсна довжина вмісту" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" msgstr "Недійсний відгук HTTP" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" 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." @@ -4667,18 +4681,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:363 +#: ../../locales/../src/interface/netconfwizard.cpp:372 +#: ../../locales/../src/interface/netconfwizard.cpp:380 +#: ../../locales/../src/interface/netconfwizard.cpp:397 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 "Недійсні дані" @@ -4718,37 +4733,37 @@ "ftps:// для FTP через TLS (неявний) і\n" "ftpes://для FTP через TLS (явний)." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "" "Недійсний проксі, після закриваючої дужки може слідувати лише кома і порт." -#: ../../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 "Недійсний шлях до сайту" @@ -4760,23 +4775,23 @@ msgid "Invalid username given." msgstr "Подано недійсне ім'я користувача." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Неправильне значення ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" 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 "Штат або провінція юрисдикції:" @@ -4784,7 +4799,7 @@ msgid "Keep directories on top" msgstr "Каталоги тримати зверху" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4819,11 +4834,11 @@ msgid "Language" msgstr "Мова" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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" @@ -4853,7 +4868,7 @@ msgid "Limit:" msgstr "Обмежити:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Перевищено довжину лінійки" @@ -4861,13 +4876,14 @@ msgid "Linked against" msgstr "Пов'язано з" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 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:118 +#: ../../locales/../src/interface/StatusView.cpp:292 +#: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" msgstr "Список:" @@ -4880,11 +4896,11 @@ msgid "Local" msgstr "Локальний" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Використовується локальна адреса" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Локальну кінцеву точку закрито" @@ -4892,21 +4908,21 @@ 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 "Локальний файл має недійсне ім'я." @@ -4918,7 +4934,7 @@ msgid "Local site:" msgstr "Локальний сайт:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "Locality:" msgstr "Розташування:" @@ -4926,12 +4942,16 @@ msgid "Log file" msgstr "Файл журналу" +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 +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: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." @@ -4940,7 +4960,7 @@ "UTF-8. Неможливо повернутись до локальних набору символів через використання " "проксі." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4948,7 +4968,7 @@ "Дані входу містять не - ASCII знаки і, можливо, сервер не сприймає кодування " "UTF-8. Спроба використати локальний набір символів." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "" "Послідовність входу виконана повністю, проте входу не відбулось. Аварійне " @@ -4968,17 +4988,17 @@ "Тип входу може бути використаним лише через адресу FTP. Аргумент повинен " "бути, або '%s', або '%s" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Низький" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../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 "Найнижчим значенням порту повинно бути число між 1 та 65535." @@ -4991,44 +5011,44 @@ 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 "Не зіставляти все з наступного" @@ -5036,12 +5056,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Максимум одночасних &передач:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Помилка виділення пам'яті" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Журнал повідомлень" @@ -5049,7 +5069,7 @@ msgid "Message log position" msgstr "Розташування журналу повідомлень" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Повідомлення занадто велике" @@ -5069,15 +5089,15 @@ msgid "Move &up" msgstr "Перемістити &вверх" -#: ../../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" @@ -5098,7 +5118,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 "Ім'я закладки вже існує." @@ -5114,7 +5134,7 @@ 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 "Потрібно ввести дійсний віддалений шлях" @@ -5122,18 +5142,18 @@ msgid "Need to specify a character encoding" msgstr "Потрібно вказати спосіб кодування знаків" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "Не вказано параметрів, ані nodename, ані servname, або невідомі" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Мережа недосяжна" @@ -5149,7 +5169,7 @@ msgid "New &tab" msgstr "Нова &вкладка" -#: ../../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 "Нова Заклад&ка" @@ -5168,14 +5188,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 "Нова директорія" @@ -5192,9 +5212,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 "Новий сайт" @@ -5202,11 +5222,11 @@ 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 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Відсутня адреса асоційована з nodename" @@ -5214,11 +5234,11 @@ msgid "No category to export selected" msgstr "Не обрано категорії для експортування" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2114 msgid "No command given, aborting." msgstr "Відсутня команда, аварійне завершення." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "" "Не встановлено зовнішньої IP адреси, робиться спроба за типовою адресою." @@ -5241,26 +5261,26 @@ msgid "No images available" msgstr "Відсутні зображення" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 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:1053 msgid "No route to host" msgstr "Нема шляху до хоста" @@ -5268,11 +5288,11 @@ 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:484 msgid "No supported SOCKS5 auth method" msgstr "Непідтримуваний метод автентифікації для SOCKS5" @@ -5282,7 +5302,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 "Жодного" @@ -5290,18 +5310,18 @@ msgid "None selected yet" msgstr "Нічого не вибрано" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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/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 "Звичайний" @@ -5311,16 +5331,16 @@ 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: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:561 msgid "Not connected to any server." msgstr "Нема під'єднання до жодного серверу." @@ -5328,11 +5348,11 @@ msgid "Not connected." msgstr "Не з'єднано." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "Не ініціалізовано, потрібно викликати WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "" "Зауважте, що даний елемент підтримується лише при використанні протоколу FTP." @@ -5376,13 +5396,13 @@ #: ../../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" @@ -5400,7 +5420,7 @@ "На наступних сторінках буде сконфігуровано обраний режим передач і режим " "нейтралізації неполадок, у випадку його увімкнення." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Один раз" @@ -5447,8 +5467,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 "Невдале відкриття" @@ -5471,19 +5491,19 @@ msgid "Operating System:" msgstr "Операційна система:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Дія вже виконується" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Дія виконується" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Дія не підтримується" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Organization:" msgstr "Організація:" @@ -5491,16 +5511,16 @@ msgid "Other SFTP options" msgstr "Інші налаштування SFTP" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" 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:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Пам'ять вичерпано" @@ -5548,7 +5568,7 @@ msgid "Overwrite if different si&ze or source newer" msgstr "Переписати, якщо роз&мір відрізняється або джерело новіше" -#: ../../locales/../src/interface/updater.cpp:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Власний тип збірки: %s\n" @@ -5575,7 +5595,7 @@ msgid "P&roxy host:" msgstr "Хост про&ксі:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "Команда ПОРТА заблокована маршрутизатором або файєрволом." @@ -5583,11 +5603,11 @@ msgid "Pa&ssive (recommended)" msgstr "Па&сивний (рекомендовано)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Значення параметру - це недійсна URL адреса" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "Аналіз %d байт інформації версії.\n" @@ -5607,13 +5627,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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:621 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 "Вимагається пароль" @@ -5622,13 +5642,13 @@ msgid "Path" msgstr "Шлях" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Для каталогу %s та підкаталогу %s шлях створити неможливо" -#: ../../locales/../src/interface/Mainfrm.cpp:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Шляху не знайдено:" @@ -5647,8 +5667,8 @@ msgid "Permission" msgstr "Дозвіл" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Не дозволено" @@ -5661,7 +5681,7 @@ msgid "Platform:" msgstr "Платформа:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5677,13 +5697,13 @@ "Сконфігуруйте усі файєрволи та маршрутизатори так, щоб дати змогу FileZillа " "встановити вихідний зв'язок по довільному порту." -#: ../../locales/../src/interface/netconfwizard.cpp:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "" "Заблокуйте у своєму маршрутизаторі такі налаштування, як 'режим DMZ ', або " "'Ігровий режим '." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5719,7 +5739,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\"" @@ -5751,7 +5771,7 @@ msgid "Please enter a password for this server:" msgstr "Введіть пароль для даного серверу:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5769,7 +5789,7 @@ "Будь-ласка, введіть час очікування в проміжку між 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 "Введіть унікальне ім'я для цих установок фільтру" @@ -5777,11 +5797,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 "" "Будь-ласка, введіть адресу URL звідки можна отримати вашу зовнішню адресу" @@ -5793,7 +5813,7 @@ msgstr "" "Введіть значення обмеження швидкості відвантаження більшим або рівним 0 %s/s." -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5801,14 +5821,14 @@ "Введіть пряму 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/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 "Введіть ім'я файлу, який необхідно створити:" @@ -5816,12 +5836,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 "Введіть свою зовнішню ІР адресу" -#: ../../locales/../src/interface/netconfwizard.cpp:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5839,7 +5859,7 @@ "Виконуйте ретельно усі інструкції, оскільки неправильне конфігурування стане " "на перешкоді успішним з'єднанням FTP." -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../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." @@ -5848,13 +5868,13 @@ "а також, переконайтесь, що ви надрукували адресу засобу розпізнавання адрес " "правильно." -#: ../../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 "" "Переконайтесь, що запитуваний регіональний параметр встановлено у вашу " "систему." -#: ../../locales/../src/interface/netconfwizard.cpp:609 +#: ../../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 " @@ -5879,7 +5899,7 @@ "що використовується троянами або іншими шкідливими програмами. Це може " "викликати хибну тривогу, яку ви можете безпечно скасувати." -#: ../../locales/../src/interface/Mainfrm.cpp:677 +#: ../../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." @@ -5897,7 +5917,7 @@ "намагаєтесь або занадто часто перепід'єднатись, або через занадто короткі " "проміжки часу." -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -5906,7 +5926,7 @@ "Якщо ви змінили середовище своєї мережі, або у випадку, якщо ви зіткнулися з " "проблемами на тих серверах, що раніше працювали - запустіть цього майстра." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Оберіть дію:" @@ -5941,7 +5961,7 @@ msgid "Please select the new attributes for the selected files." msgstr "Виберіть нові атрибути для обраних файлів." -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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. " @@ -5960,8 +5980,8 @@ msgid "Positio&n of the message log:" msgstr "Розташуванн&я журналу повідомлень:" -#: ../../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 "Поштовий індекс:" @@ -5973,12 +5993,12 @@ msgid "Preallocation" 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:686 msgid "Preserving file timestamps" msgstr "Збереження файлу часових позначок" @@ -5986,7 +6006,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 "Первинне з'єднання та сертифікати передачі даних не співпадають." @@ -6002,7 +6022,7 @@ msgid "Prioritize directories (default)" msgstr "Визначення пріоритетних каталогів (типових)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Пріоритет" @@ -6032,7 +6052,7 @@ msgid "Process &Queue" msgstr "Опрацювати &Чергу" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Переповнення таблиці обробки файлу" @@ -6042,11 +6062,11 @@ msgid "Processed %s in %s." msgstr "Опрацьовано %s в %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Протокол не підтримується" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "На даному типові сокету протокол не підтримується" @@ -6063,36 +6083,40 @@ msgid "Proxy &user:" msgstr "Користувач &проксі:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Невдала автентифікація проксі" -#: ../../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 "Невдалий обмін вітаннями з проксі: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "Хост проксі стартує з дужки '[', однак закриваючої дужки не знайдено." -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, 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:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "Невдалий запит проксі. Відповісти з проксі: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "Невдалий запит проксі: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "Невдалий запит проксі: Невідомий тип адреси у відповіді CONNECT" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "Проксі встановлено, однак хост проксі або порт не дійсні." @@ -6108,7 +6132,7 @@ msgid "Public permissions" msgstr "Публічні дозволи" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Черга опрацьована не повністю" @@ -6127,11 +6151,11 @@ msgid "Queue: empty" msgstr "Черга: пусто" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:440 msgid "Queued files" msgstr "Файли в черзі" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Система черги:" @@ -6148,7 +6172,7 @@ msgid "R&eset and requeue selected files" msgstr "С&кинути і поновити чергу обраних файлів" -#: ../../locales/../src/interface/Mainfrm.cpp:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Проста команда FTP" @@ -6165,7 +6189,7 @@ msgid "Re&name" msgstr "Пере&йменувати" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6181,12 +6205,12 @@ msgid "Read-only" msgstr "Лише читати" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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 "" @@ -6195,8 +6219,8 @@ msgstr[1] "Дійсно видалити %d каталоги з усім їхнім вмістом з сервера?" msgstr[2] "Дійсно видалити %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?" @@ -6204,25 +6228,25 @@ msgstr[1] "Дійсно видалити %d файли з сервера?" msgstr[2] "Дійсно видалити %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:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Причина" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Перезавантажити зараз" @@ -6230,36 +6254,36 @@ msgid "Rec&urse into subdirectories" msgstr "Про&ектувати в підкаталоги" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" 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:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Отримані дані заблоковано" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "Отримано неприпустимий символ в інформації версії" -#: ../../locales/../src/engine/tlssocket.cpp:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:515 msgid "Received version information is too large" msgstr "Отримана інформація версії завелика" @@ -6292,13 +6316,13 @@ msgid "Recursively deleting files and directories." 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" @@ -6308,7 +6332,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 "Пам'ятати паролі?" @@ -6316,20 +6340,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:1204 +#: ../../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 "Пошук віддаленого файлу" @@ -6368,11 +6392,11 @@ "Віддалений шлях не піддається аналізу. Переконайтесь, що це дійсний " "абсолютний шлях." -#: ../../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 "Обробка віддаленого шляху:" @@ -6412,29 +6436,29 @@ msgid "Rename selected files and directories" msgstr "Перейменувати обрані файли і каталоги" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../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:398 msgid "" "Request failed - client is not running identd (or not reachable from server)" msgstr "" "Невдалий запит - клієнт не виконує ідентифікації (або не досягається з " "сервера)" -#: ../../locales/../src/engine/proxy.cpp:378 +#: ../../locales/../src/engine/proxy.cpp:401 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "" "Невдалий запит - ідентифікація клієнта не підтверджує рядок ID користувача" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Запит відхилено або невдалий" @@ -6450,28 +6474,28 @@ msgid "Reset and requeue &all" msgstr "Скинути і поновити чергу &всіх" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" 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" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 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:113 +#: ../../locales/../src/interface/netconfwizard.cpp:411 +#: ../../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 "Результати:" @@ -6490,19 +6514,19 @@ "Поновлення файлів ASCII може створити проблеми, якщо сервер використовує " "інший формат завершення лінійки, ніж клієнт." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, c-format msgid "Retrieving directory listing of \"%s\"..." msgstr "Видобування списку каталогів з \"%s\"..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../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:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Видобування зовнішньої ІР адреси з %s" @@ -6519,7 +6543,7 @@ msgid "S&hutdown system" msgstr "Ви&мкнення системи" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "С&топ" @@ -6539,7 +6563,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Проксі SOCKS4 буде з'єднано з: %s" @@ -6548,33 +6572,33 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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:1704 msgid "Scanning for files to add to queue" msgstr "Сканування файлів, що додаються до черги" -#: ../../locales/../src/interface/QueueView.cpp:1712 +#: ../../locales/../src/interface/QueueView.cpp:1706 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 "&Умови пошуку:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "Пшук в &каталозі:" @@ -6590,8 +6614,8 @@ msgid "Security information" msgstr "Інформація безпеки" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "" "Дивіться також: https://wiki.filezilla-project.org/Network_Configuration" @@ -6644,7 +6668,7 @@ msgstr "Обрати файл для експортованих даних" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Обрати файл для експортованої черги" @@ -6653,7 +6677,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 "Обрати файл для експортованих сайтів" @@ -6661,23 +6685,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 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" 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 "Обрати ім'я кінцевого файлу" @@ -6689,7 +6713,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." @@ -6705,7 +6729,7 @@ msgstr[1] "Обрано %d каталоги." msgstr[2] "Обрано %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." @@ -6729,7 +6753,7 @@ msgstr[1] "Обрано %d файли. Загальний розмір: Принаймні %s" msgstr[2] "Обрано %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 для передачі." @@ -6767,7 +6791,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 "Обраний фільтр працює лише з локальними файлами." @@ -6793,12 +6817,12 @@ msgid "Send custom command to the server otherwise not available" msgstr "Надіслати настроювану команду на сервер" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "Надсилання команди keep-alive" #: ../../locales/../src/interface/resources/xrc/certificate.xrc:65 -#: ../../locales/../src/interface/verifycertdialog.cpp:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:255 msgid "Serial number:" msgstr "Серійний номер:" @@ -6806,21 +6830,21 @@ msgid "Server &Type:" msgstr "&Тип сервера:" -#: ../../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:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "Сервер не підтримує символи, які не належать до набору ASCII." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6829,15 +6853,15 @@ "Сервер не підтримує відновлення файлів > %d Гб. Завершення передачі, " "оскільки розміри файлів співпадають." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "Сервер не підтримує відновлення файлів > 2GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "Сервер не підтримує відновлення файлів > 4GB." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6846,7 +6870,7 @@ "Сервер може не підтримувати відновлення файлів > %d Гб. Завершення передачі, " "оскільки розміри файлів співпадають." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6854,11 +6878,11 @@ "Сервер може вимагати обліковий запис. Спробуйте уточнити обліковий запис, " "використовуючи Сайт Менеджер" -#: ../../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." @@ -6866,13 +6890,13 @@ "Сервер надіслав додаткову підказку входу. Вам потрібно скористатися " "інтерактивним типом входу." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "" "Сервер надіслав пасивну відповідь з ІP-адресою без підтримки маршрутизації. " "Невдалий пасивний режим." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6881,14 +6905,14 @@ "Натомість використовується адреса сервера." #: ../../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: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 "Сервер надіслав неочікувану відповідь." @@ -6904,7 +6928,7 @@ msgid "Server&type:" msgstr "Тип &сервера:" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Сервер/Локальний файл" @@ -6921,13 +6945,13 @@ msgid "Set &Priority" msgstr "Встановити &пріоритет" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../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 "Встановлений розмір буферу сокета викликав без сокета" @@ -6947,7 +6971,7 @@ msgid "Show &welcome dialog..." msgstr "Показати діалог &привітання..." -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "Показати обидва дерева каталогів і продовжити порівняння?" @@ -6967,7 +6991,7 @@ msgid "Shows this help dialog" msgstr "Показує цей діалог допомоги" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Вимкнути негайно" @@ -7007,23 +7031,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 "Неправильно вказаний шлях до сайту." @@ -7041,7 +7065,7 @@ "Для збереження типових закладок використовуйте Сайт Менеджер.\n" "Додати поточне з'єднання до Сайт Менеджера?" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Розмір" @@ -7060,43 +7084,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:1047 msgid "Socket address outside address space" msgstr "Адреса сокету поза адресним простором" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Сокет уже з'єднано" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Сокет було вимкнуто" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Сокет не з'єднано" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "Тип сокету не підтримується родиною адрес" -#: ../../locales/../src/interface/Mainfrm.cpp:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "Деякі файли усе ще редагуються або потребують оновлення." @@ -7113,7 +7137,7 @@ msgid "Sort directories inline" msgstr "Сортувати каталоги у тексті" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "Послідовність сортування неможливо змінити при порівнянні каталогів." @@ -7129,7 +7153,7 @@ msgid "Source and path of the drop operation are identical" msgstr "Джерело і шлях операції drop ідентичні" -#: ../../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 "Вихідний і кінцевий файл не можуть бути одинаковими" @@ -7141,7 +7165,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" @@ -7179,19 +7203,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:2147 +#: ../../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:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Розпочинаємо відвантаження %s" @@ -7200,18 +7224,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:1204 +#: ../../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 "Статус:" @@ -7223,7 +7247,7 @@ msgid "Stop recursive operation" msgstr "Зупинити рекурсивну операцію" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Street:" msgstr "Вулиця:" @@ -7239,11 +7263,11 @@ msgid "Summary of test results:" msgstr "Підсумок результатів тесту:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 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." @@ -7251,24 +7275,24 @@ "Даний вибір не зачіпає символічне посилання на файли, такі символічні " "посилання завжди видаляються." -#: ../../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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Синхронізована навігація" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Синхронізовану навігацію вимкнуто." @@ -7282,8 +7306,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Помилка синтаксису у командній лінійці" @@ -7295,11 +7319,11 @@ msgid "System details" msgstr "Подробиці системи" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "Перевищено обмеження для відкритих файлів" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Невдала підсистема мережі системи" @@ -7307,19 +7331,19 @@ msgid "T&oolbar" msgstr "П&анель інструментів" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "З'єднання TLS встановлено, надсилається запит HTTP" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "З'єднання встановлено, очікуємо на вітальне повідомлення..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "З'єднання TLS встановлено." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "Термін TTL вичерпано" @@ -7331,15 +7355,15 @@ 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:1068 msgid "Temporary failure in name resolution" msgstr "Тимчасова помилка у визначенні імені" @@ -7347,7 +7371,7 @@ msgid "Test results" msgstr "Результати тестування" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Спроможність сервера до відновлення тестування." @@ -7373,25 +7397,25 @@ "Цей Сайт Менеджер відкритий в іншій версії FileZilla 3.\n" "Закрийте його, інакше ці дані неможливо буде видалити." -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "Введена вами адреса була: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "Член параметру ai_family не підтримується" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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/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 "Очистити закладки неможливо." @@ -7417,17 +7441,17 @@ "Формат настроюваного часу недійсний, або містить непідтримувані визначники " "формату." -#: ../../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'." @@ -7438,7 +7462,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' таки існує в цьому списку" @@ -7454,7 +7478,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" @@ -7485,7 +7509,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" @@ -7495,7 +7519,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" @@ -7516,7 +7540,7 @@ "Завантаження файлів новіших версій може спричинити втрату даних.\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" @@ -7565,7 +7589,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 з відкритим вихідним кодом" @@ -7587,17 +7611,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "Обмеження повинно бути у проміжку поміж 1 та 2000 MiB" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "Неможливо створити локальний каталог '%s'." -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." 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" @@ -7606,7 +7630,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." @@ -7622,16 +7646,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "Нову версію було збережено у вашому каталозі завантажень." -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1823 msgid "The queue will not be saved." msgstr "Чергу не буде збережено." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "Віддаленого каталогу '%s' не існує." -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7670,11 +7694,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:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "Сервер надіслав неочікувану, або неопізнану відповідь." @@ -7709,7 +7733,7 @@ "Ключ хоста сервера невідомий. У вас немає гарантії того, що даний сервер " "являє собою той комп'ютер, який ви мали на увазі." -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Параметр servname не підтримується для ai_socktype" @@ -7721,20 +7745,20 @@ "Налаштування імпортовано. Для того щоб усі налаштування вступили в дію, " "необхідно перезавантажити FileZilla." -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Вказана родина адрес не підтримується" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "Вказана мережа більше недоступна" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "" "Система незабаром перезавантажиться; для відміни натисніть кнопку Скасувати." -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "Система незабаром вимкнеться; для відміни натисніть кнопку Скасувати." @@ -7746,7 +7770,7 @@ "Кінцевий файл вже існує.\n" "Оберіть дію." -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "Тест не досяг успіху. Ви дійсно бажаєте зберегти налаштування?" @@ -7759,15 +7783,15 @@ 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:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7791,7 +7815,7 @@ "Цей майстер допоможе вам правильно сконфігурувати будь-який ваш " "маршрутизатор чи файєрвол та перевірити їхню конфігурацію." -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Час" @@ -7804,26 +7828,26 @@ 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 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 msgid "Title:" msgstr "Назва:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "" "Для того, щоб порівняти каталоги, обидва списки файлів необхідно вирівняти." -#: ../../locales/../src/interface/Mainfrm.cpp:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "" "Для того, щоб це зробити, необхідно, щоб обидва дерева каталогів були або " @@ -7889,17 +7913,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 "Занадто довга лінійка заголовку" -#: ../../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 "Відстежити:" @@ -7928,17 +7952,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:630 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 "Передача" @@ -7947,8 +7971,7 @@ msgid "Transfers" msgstr "Передачі" -#: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2929 msgid "Transfers finished" msgstr "Передачі завершено" @@ -7960,11 +7983,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "Трактувати &наступні типи файлів, як файли ASCII:" -#: ../../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 "Довіряти новому ключеві хоста:" @@ -8002,7 +8025,7 @@ msgid "U&pload" msgstr "Від&вантажити" -#: ../../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 "Обмеження від&вантаження:" @@ -8012,20 +8035,20 @@ msgstr "При наявності, ви&користовувати асоціації типів файлів" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1545 -msgid "U&se system defaults" -msgstr "Ви&користовувати системні замовчування" +msgid "U&se system defaults for current language" +msgstr "В&икористати типові параметри системи для даної мови" #: ../../locales/../src/interface/resources/xrc/settings.xrc:463 msgid "USER@&HOST" msgstr "КОРИСТУВАЧ@&ХОСТ" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Неініціалізоаний код помилки %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Unit:" msgstr "Модуль:" @@ -8034,12 +8057,12 @@ msgid "Unknown" msgstr "Невідомо" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "" "Невідомий тип FTP проксі, неможливо згенерувати послідовність логінування." -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Невідома версія протоколу SOCKS: %d" @@ -8052,7 +8075,7 @@ msgid "Unknown host key" msgstr "Невідомий ключ хоста" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -8066,8 +8089,8 @@ msgstr "" "Невідомий елемент вузла; не схоже, щоб даний файл був згенерованим FileZilla." -#: ../../locales/../src/interface/netconfwizard.cpp:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -8075,7 +8098,7 @@ "Якщо ці проблеми не будуть усунуті, активний режим FTP не працюватиме і " "необхідно використати пасивний режим." -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../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." @@ -8083,11 +8106,11 @@ "Якщо ця проблема не буде усунута, активний режим 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 "Непідтримуване перескерування" @@ -8157,12 +8180,12 @@ msgid "Use &custom editor:" msgstr "Використати &настроюваний редактор:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2912 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2919 msgid "Use &default editor for text files" msgstr "Використати &типовий редактор для текстових файлів" #: ../../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 "Використати &синхронізовану навігацію" @@ -8190,8 +8213,8 @@ msgstr "Використати сервер з Сайт Менеджера" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Використати системні &замовчування" +msgid "Use system &defaults for current language" +msgstr "Використати &типові параметри системи для даної мови" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8228,7 +8251,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 "Ім'я користувача не може складатися з серії пробілів" @@ -8252,7 +8275,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Багатошарові журнали повідомлень від wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Перевірка сертифікату..." @@ -8260,7 +8283,7 @@ msgid "Very high" msgstr "Дуже високий" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "Переглянути прихований набір опцій,проте не підтримуваних сервером" @@ -8276,15 +8299,15 @@ msgid "W&rite" msgstr "Пи&сати" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1665 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 "Очікування на пароль" @@ -8296,7 +8319,7 @@ msgid "Waiting to retry..." msgstr "Очікування на повторну спробу..." -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "Попередження,ігнорування з'єднання даних з неправильної ІР." @@ -8319,11 +8342,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 "Що нового" @@ -8331,7 +8354,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." @@ -8356,7 +8379,7 @@ 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 запам'ятовувала паролі?" @@ -8364,20 +8387,20 @@ msgid "Wr&ite" msgstr "Пи&сати" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Неправильна зовнішня ІР адреса" -#: ../../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:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8389,7 +8412,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 "Даний діалог завжди можна відкрити через меню допомоги." @@ -8428,19 +8451,19 @@ 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 "" "Ви обрали більше, ніж 10 файлів для редагування; дійсно бажаєте продовжити?" -#: ../../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?" @@ -8448,7 +8471,7 @@ "Ви обрали більше, ніж 10 файлів або каталогів для відкриття; дійсно бажаєте " "продовжити?" -#: ../../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 "Необхідно ввести ім'я хосту." @@ -8457,30 +8480,30 @@ msgid "You have to enter a key file path" 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 "Необхідно ввести дійсну ІР адресу." +#: ../../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:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8532,23 +8555,23 @@ "Щоб увімкнути синхронізовану навігацію для цього сайту, необхідно ввести як " "локальний, так і віддалений шляхи." -#: ../../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:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8556,7 +8579,7 @@ "У вас не повинно виникнути проблем у з'єднанні з іншими серверами. Передачі " "файлів повинні працювати правильно." -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "Ваш комп'ютер призупиниться, якщо не натиснути Скасувати." @@ -8581,7 +8604,7 @@ msgid "contains" msgstr "вміщує" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "додатково" @@ -8603,19 +8626,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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "файл" -#: ../../locales/../src/interface/edithandler.cpp:97 +#: ../../locales/../src/interface/edithandler.cpp:98 msgid "fz3temp-lockfile" msgstr "fz3temp-файл блокування" -#: ../../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 " @@ -8625,15 +8648,15 @@ "Переконайтесь, що він знаходиться у тому ж каталозі, що і головний " "виконуючий файл FileZilla." -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of 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 не повернула сертифікатів" @@ -8689,10 +8712,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: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 "невідомо" @@ -8713,6 +8736,30 @@ msgid "wxWidgets:" msgstr "wxВіджети:" +#~ msgid "Empty dirs to visit" +#~ msgstr "Порожні каталоги для відвідин" + +#~ msgid "Connected" +#~ msgstr "З'єднано" + +#~ msgid "Deleting directories" +#~ 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 "Ви&користовувати системні замовчування" + +#~ msgid "Use system &defaults" +#~ msgstr "Використати системні &замовчування" + #~ 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 " diff -Nru filezilla-3.14.1/locales/vi_VN.po filezilla-3.15.0.2/locales/vi_VN.po --- filezilla-3.14.1/locales/vi_VN.po 2015-09-09 14:05:02.000000000 +0000 +++ filezilla-3.15.0.2/locales/vi_VN.po 2016-02-05 08:54:46.000000000 +0000 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: filezilla 3.14.0-rc1\n" +"Project-Id-Version: filezilla 3.14.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-09 15:59+0200\n" -"PO-Revision-Date: 2015-09-07 15:05+0700\n" +"POT-Creation-Date: 2016-01-13 13:13+0100\n" +"PO-Revision-Date: 2015-12-31 07:19+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi_VN\n" @@ -50,9 +50,9 @@ msgid_plural "%d directories" msgstr[0] "%d thư mục" -#: ../../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" @@ -60,9 +60,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" @@ -80,12 +80,12 @@ 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:2781 +#: ../../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:103 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -122,7 +122,7 @@ msgid "%s (? B/s)" msgstr "%s (? B/s)" -#: ../../locales/../src/interface/verifycertdialog.cpp:45 +#: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" msgstr "%s - Chứng nhận đã hết hạn!" @@ -153,7 +153,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 " @@ -168,7 +168,7 @@ "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:680 +#: ../../locales/../src/interface/FileZilla.cpp:702 #, c-format msgid "" "%s could not be found. Without this component of FileZilla, SFTP will not " @@ -186,10 +186,10 @@ "trường.\n" "- Đặt đường dẫn đầy đủ của %s trong biến môi trường FZ_FZSFTP." -#: ../../locales/../src/interface/verifycertdialog.cpp:61 +#: ../../locales/../src/interface/verifycertdialog.cpp:63 #, c-format msgid "%s with %d bits" -msgstr "%s với %d bit" +msgstr "%s với %d bít" #: ../../locales/../src/interface/resources/xrc/settings.xrc:509 #, c-format @@ -200,7 +200,7 @@ msgid "%w - Proxy password" msgstr "%w - Mật khẩu máy chủ ủy nhiệm" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 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." @@ -253,7 +253,7 @@ 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:2957 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2964 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" @@ -292,9 +292,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 @@ -307,8 +307,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" @@ -381,14 +381,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 "&Xóa bỏ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3226 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3233 msgid "&Delete symlink" msgstr "&Xóa liên kết mềm" @@ -396,12 +396,12 @@ msgid "&Directory comparison" msgstr "So sánh &thư mục" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 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:966 +#: ../../locales/../src/interface/state.cpp:960 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ủ" @@ -428,7 +428,7 @@ msgid "&Display size in bytes" msgstr "&Hiển thị kích thước tính theo byte" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../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)" @@ -449,7 +449,7 @@ msgid "&Download" msgstr "Tải &xuống" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3115 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3122 msgid "&Download to:" msgstr "Tải &xuống:" @@ -482,7 +482,7 @@ msgid "&Enable compression" msgstr "&Cho phép nén" -#: ../../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 "&Bật giới hạn tốc độ" @@ -499,7 +499,7 @@ msgid "&Enter custom command..." msgstr "&Nhập vào dòng lệnh của bạn…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "&Thiết lập kết nối trong một tab mới" @@ -552,7 +552,7 @@ 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:3151 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3158 msgid "" "&Flatten remote paths, download all contained files directly into target " "directory" @@ -560,7 +560,7 @@ "&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:3233 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3240 msgid "&Follow symlink, delete target directory contents" msgstr "&Theo liên kết mềm, xóa nội dung thư mục đích" @@ -623,7 +623,7 @@ msgid "&Install new version" msgstr "&Cài đặt phiên bản mớ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 "&Giữ cấu trúc đường dẫn máy mạng tương đối để tìm kiếm thư mục gốc" @@ -648,7 +648,7 @@ 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:2737 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2744 msgid "&Local directory:" msgstr "&Thư mục máy nội bộ:" @@ -712,11 +712,11 @@ msgid "&New Site" msgstr "Địa chỉ &mới" -#: ../../locales/../src/interface/Mainfrm.cpp:1687 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" msgstr "Đã có bả&n mới!" -#: ../../locales/../src/interface/netconfwizard.cpp:26 +#: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" msgstr "&Tiếp theo >" @@ -739,7 +739,7 @@ msgstr "Giá trị bằ&ng số:" #: ../../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 "Đồn&g ý" @@ -816,12 +816,12 @@ 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:3653 +#: ../../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:2761 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2768 msgid "&Remote directory:" msgstr "&Thư mục máy mạng:" @@ -842,7 +842,7 @@ msgstr "&Xóa mục đã chọn" #: ../../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 @@ -903,7 +903,7 @@ msgid "&Save as..." msgstr "&Ghi lại bằng tên mới…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3006 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3013 msgid "&Search" msgstr "&Tìm kiếm" @@ -972,7 +972,7 @@ msgid "&Speed limits" msgstr "&Giới hạn tốc độ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3162 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 msgid "&Start transfer immediately" msgstr "Bắt đầu truyền ngay &lập tức" @@ -984,7 +984,7 @@ msgid "&TLS Ciphers" msgstr "Kiểu mã hóa &TLS" -#: ../../locales/../src/interface/netconfwizard.cpp:243 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "Kiểm &tra" @@ -1028,7 +1028,7 @@ msgid "&Uploads:" msgstr "Tải &lên:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2932 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2939 msgid "&Use custom program" msgstr "&Dùng chương trình riêng" @@ -1062,7 +1062,7 @@ msgid "&Username:" msgstr "Tên tài kh&oản:" -#: ../../locales/../src/interface/Mainfrm.cpp:1681 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "&Phiên bản %s" @@ -1106,12 +1106,12 @@ msgid "'%s' is not a directory." msgstr "“%s” không phải một thư mục." -#: ../../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 "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:440 +#: ../../locales/../src/interface/manual_transfer.cpp:441 msgid "" "'Normal' and 'Account' logontypes are not available, using 'Ask for " "password' instead." @@ -1127,7 +1127,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:578 +#: ../../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 " @@ -1184,8 +1184,8 @@ msgid "(example: %Y-%m-%d)" msgstr "(ví dụ: %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 @@ -1234,7 +1234,7 @@ #: ../../locales/../src/interface/aboutdialog.cpp:98 msgid "32-bit system" -msgstr "Hệ thống 32 bit" +msgstr "Hệ thống 32-bít" #: ../../locales/../src/interface/resources/xrc/settings.xrc:2248 msgid "4 - Debug" @@ -1242,9 +1242,9 @@ #: ../../locales/../src/interface/aboutdialog.cpp:96 msgid "64-bit system" -msgstr "Hệ thống 64 bit" +msgstr "Hệ thống 64-bít" -#: ../../locales/../src/interface/netconfwizard.cpp:27 +#: ../../locales/../src/interface/netconfwizard.cpp:28 msgid "< &Back" msgstr "< &Quay lại" @@ -1264,7 +1264,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 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ó." @@ -1291,7 +1291,7 @@ "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: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 " @@ -1310,7 +1310,7 @@ msgid "A new version of FileZilla is available:" msgstr "Đã có phiên bản FileZilla mới hơn:" -#: ../../locales/../src/interface/Mainfrm.cpp:638 +#: ../../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." @@ -1327,7 +1327,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: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?" @@ -1379,11 +1379,11 @@ #: ../../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: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" @@ -1409,7 +1409,7 @@ msgid "Active mode" msgstr "Chế độ tích cực" -#: ../../locales/../src/interface/netconfwizard.cpp:620 +#: ../../locales/../src/interface/netconfwizard.cpp:614 msgid "" "Active mode FTP test failed. FileZilla does not know the correct external IP " "address." @@ -1417,7 +1417,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:607 +#: ../../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." @@ -1426,7 +1426,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:595 +#: ../../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 " @@ -1440,7 +1440,7 @@ msgid "Active mode IP" msgstr "Kích hoạt ở chế độ IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "Chỉ thêm tập tin vào &hàng đợi" @@ -1459,7 +1459,7 @@ msgid "Add to queue" msgstr "Thêm vào hàng đợi" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "Kiểu địa chỉ không được hỗ trợ" @@ -1481,7 +1481,7 @@ "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:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "&Luôn dùng hành động này" @@ -1489,7 +1489,7 @@ msgid "Algorithm:" msgstr "Thuật toán:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2947 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,7 +1497,7 @@ 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:2946 +#: ../../locales/../src/interface/QueueView.cpp:2943 #, 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 +1512,11 @@ 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:3460 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3467 msgid "Already connected" msgstr "Đã có kết nối sẵn dùng" -#: ../../locales/../src/interface/verifycertdialog.cpp:82 +#: ../../locales/../src/interface/verifycertdialog.cpp:84 msgid "Alternative name:" msgid_plural "Alternative names:" msgstr[0] "Tên thay thế:" @@ -1545,7 +1545,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:1911 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1554,7 +1554,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:1821 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1563,23 +1563,23 @@ "Đã 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: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 "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: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/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 "Nặc danh" -#: ../../locales/../src/interface/state.cpp:943 +#: ../../locales/../src/interface/state.cpp:937 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." @@ -1589,11 +1589,11 @@ 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:212 +#: ../../locales/../src/interface/filter.cpp:213 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:969 +#: ../../locales/../src/interface/filter.cpp:970 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." @@ -1617,7 +1617,7 @@ msgid "Archive" msgstr "Kho lưu" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "Bộ đệm tham số bị tràn" @@ -1635,7 +1635,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "Hỏi mật khẩu" @@ -1647,7 +1647,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:3409 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3416 msgid "Asking questions in the FileZilla forums" msgstr "Hỏi tại diễn đàn FileZilla" @@ -1667,7 +1667,7 @@ msgid "Attribute" msgstr "Thuộc tính" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:661 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "Không đúng thẩm quyền." @@ -1696,11 +1696,11 @@ msgid "B&ypass proxy" msgstr "Bằng cách dùng chủ ủ&y nhiệm" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "Bộ mô tả tập tin sai" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "Cách dùng cơ bản" @@ -1713,7 +1713,7 @@ msgid "Being edited" msgstr "Đang được sửa chữa" -#: ../../locales/../src/engine/tlssocket.cpp:1030 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "Cẩn thận! Giấy chứng nhận đã bị thu hồi" @@ -1731,11 +1731,11 @@ msgid "Bookmark" msgstr "Dấu trang" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2800 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2807 msgid "Bookmark:" msgstr "Dấu trang:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2789 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2796 msgid "Bookmarks" msgstr "Dấu trang" @@ -1751,7 +1751,7 @@ msgid "Build information" msgstr "Thông tin biên dịch" -#: ../../locales/../src/interface/verifycertdialog.cpp:217 +#: ../../locales/../src/interface/verifycertdialog.cpp:241 msgid "Business category:" msgstr "Phạm trù được làm:" @@ -1788,24 +1788,24 @@ #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:773 msgid "CPU features:" -msgstr "Đặc tính CPU:" +msgstr "Tính năng CPU:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1568 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1215 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 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:668 +#: ../../locales/../src/engine/transfersocket.cpp:670 msgid "Can't read from file" msgstr "Không thể đọc từ tập tin" -#: ../../locales/../src/engine/transfersocket.cpp:648 -#: ../../locales/../src/engine/transfersocket.cpp:714 +#: ../../locales/../src/engine/transfersocket.cpp:650 +#: ../../locales/../src/engine/transfersocket.cpp:716 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:650 -#: ../../locales/../src/engine/transfersocket.cpp:716 +#: ../../locales/../src/engine/transfersocket.cpp:652 +#: ../../locales/../src/engine/transfersocket.cpp:718 #, c-format msgid "Can't write data to file: %s" msgstr "Không thể ghi dữ liệu vào tập tin: %s" @@ -1823,13 +1823,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 "Thôi" @@ -1847,11 +1847,11 @@ 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:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 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:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "Không thể gán địa chỉ đã yêu cầu" @@ -1877,20 +1877,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 "Không thể sửa tập tin" -#: ../../locales/../src/interface/LocalListView.cpp:1582 +#: ../../locales/../src/interface/LocalListView.cpp:1587 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:1591 +#: ../../locales/../src/interface/LocalListView.cpp:1596 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:338 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1907,11 +1907,11 @@ msgid "Cannot load key file" msgstr "Không thể tải tập tin khóa" -#: ../../locales/../src/interface/Mainfrm.cpp:984 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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:444 +#: ../../locales/../src/interface/manual_transfer.cpp:445 msgid "Cannot remember password" msgstr "Không thể lưu mật khẩu" @@ -1920,22 +1920,22 @@ msgid "Cannot rename entry" msgstr "Không thể đổi tên đề mục" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Cannot rename file" msgstr "Không thể đổi tên tập tin" -#: ../../locales/../src/engine/proxy.cpp:148 +#: ../../locales/../src/engine/proxy.cpp:172 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:339 -#: ../../locales/../src/interface/filter.cpp:403 +#: ../../locales/../src/interface/filter.cpp:340 +#: ../../locales/../src/interface/filter.cpp:404 msgid "Cannot save filterset" msgstr "Không thể ghi lại bộ lọc" -#: ../../locales/../src/interface/filter.cpp:303 +#: ../../locales/../src/interface/filter.cpp:304 msgid "Cannot select filter" msgstr "Không thể chọn bộ lọc" @@ -2002,7 +2002,7 @@ 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:574 +#: ../../locales/../src/interface/FileZilla.cpp:596 msgid "Character encoding issue" msgstr "Dạng ký tự mã hóa" @@ -2030,7 +2030,7 @@ msgid "Check for updates failed" msgstr "Kiểm tra phiên bản mới gặp lỗi" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." @@ -2038,7 +2038,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:777 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." @@ -2046,7 +2046,7 @@ "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:770 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "Kiểm tra địa chỉ IP" @@ -2054,12 +2054,12 @@ msgid "Checking for updates..." msgstr "Đang kiểm tra phiên bản mới…" -#: ../../locales/../src/interface/updater.cpp:715 +#: ../../locales/../src/interface/updater.cpp:716 #, 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:711 +#: ../../locales/../src/interface/updater.cpp:712 #, 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" @@ -2074,11 +2074,11 @@ #: ../../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 "Chọn thư mục nội bộ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:808 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:811 msgid "Chunk data improperly terminated" msgstr "Tổng kiểm tra dữ liệu tận cùng không đúng" @@ -2116,7 +2116,7 @@ msgid "Clear quickconnect bar" msgstr "Xóa thanh công cụ kết nối nhanh" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../locales/../src/interface/netconfwizard.cpp:580 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." @@ -2133,8 +2133,8 @@ msgstr "Đóng tất cả các t&ab khác" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "Đóng FileZilla" @@ -2162,13 +2162,13 @@ 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: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 "Lệnh gặp lỗi" -#: ../../locales/../src/engine/proxy.cpp:502 +#: ../../locales/../src/engine/proxy.cpp:525 msgid "Command not supported" msgstr "Lệnh không được hỗ trợ" @@ -2176,9 +2176,9 @@ 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: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 "Lệnh:" @@ -2186,12 +2186,12 @@ msgid "Comment" msgstr "Chú thích" -#: ../../locales/../src/interface/verifycertdialog.cpp:215 +#: ../../locales/../src/interface/verifycertdialog.cpp:239 msgid "Common name:" msgstr "Tên thông thường:" -#: ../../locales/../src/interface/netconfwizard.cpp:441 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 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" @@ -2238,7 +2238,7 @@ msgstr "Truyền đồng thời" #: ../../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 "Điều kiện thì phân biệt HO&A/thường" @@ -2254,24 +2254,24 @@ msgid "Configure port range" msgstr "Cấu hình vùng cổng" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3372 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3379 msgid "Configuring FileZilla and your network" msgstr "Cấu hình FileZilla và mạng của bạn" -#: ../../locales/../src/interface/search.cpp:768 +#: ../../locales/../src/interface/search.cpp:747 msgid "Confirm deletion" msgstr "Xác nhận khi xóa" -#: ../../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 "Xác nhận cần thiết" -#: ../../locales/../src/interface/netconfwizard.cpp:582 +#: ../../locales/../src/interface/netconfwizard.cpp:576 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." @@ -2279,6 +2279,11 @@ 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 +msgid "Connect failed: %s" +msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "Kết nối vào tab hiện tại" @@ -2291,29 +2296,29 @@ 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:906 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "Đã kết nối" -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "Đang kết nối" -#: ../../locales/../src/interface/netconfwizard.cpp:222 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối tới %s" -#: ../../locales/../src/engine/ControlSocket.cpp:1048 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4240 +#: ../../locales/../src/engine/ControlSocket.cpp:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, 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:956 -#: ../../locales/../src/engine/proxy.cpp:243 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:369 +#: ../../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 "Đang kết nối tới %s…" @@ -2322,119 +2327,124 @@ msgid "Connection" msgstr "Kết nối" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "Kết nối bị bãi bỏ" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "Cố gắng kết nối gặp lỗi" -#: ../../locales/../src/engine/ControlSocket.cpp:920 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, 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:925 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, 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:183 +#: ../../locales/../src/engine/ControlSocket.cpp:185 #: ../../locales/../src/engine/engineprivate.cpp:681 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:1066 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "Kết nối bị lỗi quá thời gian" -#: ../../locales/../src/interface/netconfwizard.cpp:558 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "Kết nối đã đóng" -#: ../../locales/../src/engine/ControlSocket.cpp:1015 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "Kết nối đã đóng bởi máy chủ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:285 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:308 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:310 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/engine/ftpcontrolsocket.cpp:410 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +#, fuzzy +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/engine/ftpcontrolsocket.cpp:413 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:353 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "Mất kết nối" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 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:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "Kết nối đã bị từ chối" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "Kết nối đã bị từ chối bởi máy chủ" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "Kết nối đã bị đặt lại bởi mạng" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 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: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] "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:1076 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 msgid "Connection timed out." msgstr "Kết nối bị lỗi quá thời gian." -#: ../../locales/../src/interface/search.cpp:383 +#: ../../locales/../src/interface/search.cpp:386 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:226 +#: ../../locales/../src/engine/proxy.cpp:249 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:576 +#: ../../locales/../src/interface/netconfwizard.cpp:570 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:567 +#: ../../locales/../src/interface/netconfwizard.cpp:561 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:106 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:105 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:1849 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1852 #, 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:1829 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1832 #, c-format msgid "Copy of %s" msgstr "Bản sao của %s" @@ -2444,7 +2454,7 @@ 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:178 +#: ../../locales/../src/engine/transfersocket.cpp:180 #, c-format msgid "Could not accept connection: %s" msgstr "Không thể chấp nhận kết nối: %s" @@ -2454,30 +2464,30 @@ msgid "Could not add connection to Site Manager" msgstr "Không thể thêm kết nối này vào danh bạ." -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "Không thể hoàn tất thao tác" -#: ../../locales/../src/engine/ControlSocket.cpp:185 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "Không thể kết nối tới máy chủ" -#: ../../locales/../src/engine/ControlSocket.cpp:1085 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, 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:792 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:788 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: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 "Không thể chuyển đổi khóa riêng" -#: ../../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 "Không thể sao chép URL" @@ -2485,17 +2495,17 @@ msgid "Could not copy data" msgstr "Không thể sao chép dữ liệu" -#: ../../locales/../src/interface/updater.cpp:458 +#: ../../locales/../src/interface/updater.cpp:459 #, 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:165 +#: ../../locales/../src/engine/logging.cpp:173 #, 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: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" @@ -2506,11 +2516,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:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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: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 " @@ -2521,11 +2531,11 @@ "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:678 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 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:930 +#: ../../locales/../src/engine/tlssocket.cpp:958 msgid "" "Could not get distinguished name of certificate issuer, " "gnutls_x509_get_issuer_dn failed" @@ -2533,7 +2543,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:907 +#: ../../locales/../src/engine/tlssocket.cpp:935 msgid "" "Could not get distinguished name of certificate subject, gnutls_x509_get_dn " "failed" @@ -2541,26 +2551,31 @@ "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:929 +#: ../../locales/../src/interface/state.cpp:923 msgid "Could not get full remote path." msgstr "Không thể lấy đường dẫn đầy đủ." -#: ../../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 "Không thể nhận trả lời từ 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 "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:853 +#: ../../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/engine/tlssocket.cpp:848 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, fuzzy, c-format +msgid "Could not initialize Winsock (%d): %s" +msgstr "Không thể ghi vào gói mạng: %s" + +#: ../../locales/../src/engine/tlssocket.cpp:876 msgid "" "Could not initialize structure for peer certificates, gnutls_x509_crt_init " "failed" @@ -2583,11 +2598,11 @@ msgid "Could not load key file" msgstr "Không thể tải tập tin khóa" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:125 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:124 msgid "Could not load private key" msgstr "Không thể tải khóa riêng tập tin" -#: ../../locales/../src/interface/state.cpp:951 +#: ../../locales/../src/interface/state.cpp:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2597,7 +2612,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:361 +#: ../../locales/../src/interface/state.cpp:362 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2607,7 +2622,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:266 +#: ../../locales/../src/interface/state.cpp:267 #, c-format msgid "" "Could not obtain corresponding remote directory for the local directory " @@ -2618,14 +2633,14 @@ "Chức năng duyệt đồng bộ đã bị tắt." #: ../../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 "Không mở được clipboard" -#: ../../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 "Không mở được tập tin nhật ký: %s" @@ -2638,42 +2653,52 @@ msgid "Could not parse server address:" msgstr "Không rõ cú pháp địa chỉ máy chủ:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:208 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "Không thể đọc gói mạng: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "Không thể đọc gói mạng: %s" -#: ../../locales/../src/interface/sitemanager.cpp:466 +#: ../../locales/../src/interface/sitemanager.cpp:468 msgid "Could not read server item." msgstr "Không đọc mục tin máy chủ." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2589 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +msgid "Could not receive data from server." +msgstr "Không thể kết nối tới 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/engine/ftpcontrolsocket.cpp:2500 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:224 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:223 msgid "Could not send command to fzputtygen." msgstr "Không thể gửi lệnh tới fzputtygen." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 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:1062 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, 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:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "Không thể bắt đầu truyền" -#: ../../locales/../src/interface/sitemanager.cpp:608 +#: ../../locales/../src/interface/sitemanager.cpp:610 #: ../../locales/../src/interface/sitemanager_dialog.cpp:829 #, c-format msgid "" @@ -2692,7 +2717,7 @@ 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:1850 +#: ../../locales/../src/interface/QueueView.cpp:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2701,9 +2726,9 @@ "Không thể ghi vào \"%s\", hàng đợi không thể ghi lại.\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 "Không thể ghi \"%s\", các địa chỉ đã chọn không thể xuất ra: %s" @@ -2713,28 +2738,28 @@ msgid "Could not write \"%s\":" msgstr "Không thể ghi \"%s\":" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:147 #, 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:331 +#: ../../locales/../src/interface/queue.cpp:337 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: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 "Không thể ghi vào tập tin nhật ký: %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 "Không thể ghi vào gói mạng: %s" -#: ../../locales/../src/interface/verifycertdialog.cpp:220 +#: ../../locales/../src/interface/verifycertdialog.cpp:244 msgid "Country:" msgstr "Quốc gia:" @@ -2742,11 +2767,11 @@ msgid "Crea&te new file" msgstr "&Tạo tập tin mới" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 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:892 +#: ../../locales/../src/interface/state.cpp:886 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ó" @@ -2775,45 +2800,45 @@ msgid "Create director&y and enter it" msgstr "Tạo thư &mục mới và vào 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:902 +#: ../../locales/../src/interface/LocalTreeView.cpp:1120 +#: ../../locales/../src/interface/RemoteListView.cpp:1293 +#: ../../locales/../src/interface/RemoteTreeView.cpp:1219 msgid "Create directory" msgstr "Tạo thư mục mới" -#: ../../locales/../src/interface/RemoteListView.cpp:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 msgid "Create empty file" msgstr "Tạo tập tin trống rỗng" -#: ../../locales/../src/interface/queue.cpp:334 +#: ../../locales/../src/interface/queue.cpp:340 msgid "Creating directory" msgstr "Đang tạo thư mục mới" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3164 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1931 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "Đang tạo thư mục “%s”…" -#: ../../locales/../src/engine/ControlSocket.cpp:178 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "Giới hạn sai" -#: ../../locales/../src/engine/ControlSocket.cpp:169 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "Giới hạn sai:" -#: ../../locales/../src/engine/ControlSocket.cpp:133 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "Lỗi đạt tới tới hạn tập tin" -#: ../../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 "Lỗi tới hạn tập tin sau khi truyền đi %s trong %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" @@ -2843,7 +2868,7 @@ msgid "Cus&tom" msgstr "T&ùy chọn của bạn" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "Đặt bộ lọc của bạn" @@ -2870,6 +2895,10 @@ msgid "D&elete" msgstr "&Xóa" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "So sánh t&hư mục" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "Tắt tất &cả" @@ -2883,7 +2912,7 @@ 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:2835 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2842 msgid "D&uplicate" msgstr "&Nhân bản" @@ -2899,8 +2928,8 @@ msgid "Data" msgstr "Dữ liệu" -#: ../../locales/../src/interface/netconfwizard.cpp:993 -#: ../../locales/../src/interface/netconfwizard.cpp:1057 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "Gói tin truyền đi bị đóng quá sớm." @@ -3014,19 +3043,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "Đang xóa bỏ %u tập tin từ “%s”" -#: ../../locales/../src/interface/search.cpp:753 -msgid "Deleting directories" -msgstr "Đang xóa các thư mục" - -#: ../../locales/../src/interface/search.cpp:753 -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ợ" - -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3204 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3211 msgid "Deleting symbolic link" msgstr "Xóa liên kết mềm" -#: ../../locales/../src/interface/LocalTreeView.cpp:958 +#: ../../locales/../src/interface/LocalTreeView.cpp:955 msgid "Desktop" msgstr "Thư mục Desktop" @@ -3048,7 +3069,7 @@ msgid "Dire&ctories" msgstr "Các &thư mục" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "Hướng" @@ -3056,13 +3077,13 @@ msgid "Directory" msgstr "Thư mục" -#: ../../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:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "So sánh thư mục" @@ -3075,11 +3096,11 @@ 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:189 +#: ../../locales/../src/engine/ControlSocket.cpp:191 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:2023 +#: ../../locales/../src/interface/RemoteListView.cpp:2013 msgid "Directory listing failed" msgstr "Liệt kê thư mục gặp lỗi" @@ -3087,12 +3108,12 @@ msgid "Directory listing filters" msgstr "Bộ lọc danh sách thư mục" -#: ../../locales/../src/engine/ControlSocket.cpp:197 +#: ../../locales/../src/engine/ControlSocket.cpp:199 #, 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:194 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "Lấy danh sách thư mục thành công" @@ -3100,12 +3121,12 @@ msgid "Disa&ble all" msgstr "&Tắt tất cả" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 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:640 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3116,23 +3137,23 @@ msgid "Disconnect from server" msgstr "Ngắt kết nối khỏi máy chủ" -#: ../../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:213 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:882 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:884 +#: ../../locales/../src/interface/queue.cpp:331 msgid "Disconnected from server" msgstr "Đã ngắt kết nối khỏi máy chủ" -#: ../../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 "Ngắt kết nối từ máy chủ: %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 "Đã ngắt kết nối từ máy chủ dịch vụ trước đó" @@ -3158,8 +3179,8 @@ 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:1128 -#: ../../locales/../src/interface/Mainfrm.cpp:1150 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "Bạn có thật sự muốn thoát khỏi FileZilla không?" @@ -3182,7 +3203,7 @@ 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:579 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, 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?" @@ -3191,7 +3212,7 @@ 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:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "Tài liệu" @@ -3211,7 +3232,7 @@ msgid "Download" msgstr "Tải về" -#: ../../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 "&Giới hạn tải xuống:" @@ -3225,9 +3246,9 @@ msgid "Download limit: none" msgstr "Giới hạn tải xuống: không" -#: ../../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 "Tải về kết quả tìm kiếm" @@ -3239,7 +3260,7 @@ 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:956 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3252,26 +3273,18 @@ msgid "Downloading" msgstr "Đang tải về" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:326 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:328 #, c-format msgid "Downloading %s" msgstr "Đang tải về %s" -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading multiple unrelated directories is not yet supported" -msgstr "Việc bội tải xuống không liên quan đến thư mục vẫn chưa được hỗ trợ" - -#: ../../locales/../src/interface/search.cpp:615 -msgid "Downloading search results" -msgstr "Đang tải về kết quả tìm kiếm" - #: ../../locales/../src/interface/resources/xrc/update.xrc:81 msgid "Downloading update..." msgstr "Đang tải bản cập nhật về…" -#: ../../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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3280,9 +3293,9 @@ 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: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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3316,7 +3329,7 @@ msgid "E&xport..." msgstr "&Xuất ra…" -#: ../../locales/../src/interface/verifycertdialog.cpp:226 +#: ../../locales/../src/interface/verifycertdialog.cpp:250 msgid "E-Mail:" msgstr "Thư điện tử:" @@ -3333,16 +3346,16 @@ "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:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing directories is not supported" msgstr "Chưa hỗ trợ các thư mục sửa" -#: ../../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 "Việc sửa gặp lỗi" -#: ../../locales/../src/interface/search.cpp:700 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "Kết quả tìm kiếm những thứ sửa" @@ -3350,7 +3363,7 @@ msgid "Email:" msgstr "Thư điện tử:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "Lệnh rỗng" @@ -3358,7 +3371,7 @@ msgid "Empty command." msgstr "Lệnh rỗng." -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "Danh sách thư mục rỗng" @@ -3366,6 +3379,12 @@ 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." @@ -3404,7 +3423,7 @@ msgid "Encryption details" msgstr "Thông tin chi tiết mã hóa" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "Kết thúc so sánh và thay đổi thứ tự sắp xếp?" @@ -3412,15 +3431,15 @@ msgid "Enter &custom command..." msgstr "Nhập vào &lệnh tùy ý…" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3597 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3604 msgid "Enter 0 for unlimited speed." msgstr "Nhập 0 để không giới hạn tốc độ" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../locales/../src/interface/QueueView.cpp:2109 msgid "Enter command" msgstr "Nhập lệnh vào" -#: ../../locales/../src/interface/Mainfrm.cpp:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "Nhập vào lệnh của bạn" @@ -3434,11 +3453,11 @@ msgid "Enter filter name" msgstr "Nhập tên bộ lọc" -#: ../../locales/../src/interface/filter.cpp:333 +#: ../../locales/../src/interface/filter.cpp:334 msgid "Enter name for filterset" msgstr "Nhập tên bộ lọc muốn đặt" -#: ../../locales/../src/interface/filter.cpp:391 +#: ../../locales/../src/interface/filter.cpp:392 msgid "Enter new name for filterset" msgstr "Nhập tên mới bộ lọc muốn đặt" @@ -3479,7 +3498,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:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3509,7 +3528,7 @@ msgid "Error importing" msgstr "Lỗi nhập vào" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "Lỗi khi tải hàng đợi" @@ -3518,50 +3537,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/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: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:939 msgid "Error loading xml file" msgstr "Lỗi tải tập tin xml" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1819 msgid "Error saving queue" msgstr "Lỗi ghi lại hàng đợi" -#: ../../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 "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:1851 -#: ../../locales/../src/interface/sitemanager.cpp:609 -#: ../../locales/../src/interface/sitemanager.cpp:719 -#: ../../locales/../src/interface/sitemanager.cpp:773 +#: ../../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:2224 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2227 #: ../../locales/../src/interface/xmlfunctions.cpp:147 msgid "Error writing xml file" msgstr "Lỗi ghi tập tin 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 "Lỗi:" @@ -3653,24 +3672,24 @@ msgid "FTPS - FTP over implicit TLS" msgstr "Giao thức FTPES - FTP ngầm thông qua 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/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 "Đổi thư mục gặp lỗi" -#: ../../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 "Đổi ngôn ngữ gặp lỗi" -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2030 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2033 msgid "Failed to copy or move sites" msgstr "Sao chép hay di chuyển địa chỉ gặp lỗi" @@ -3678,29 +3697,29 @@ 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:802 +#: ../../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/engine/ftpcontrolsocket.cpp:4068 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4072 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 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:625 +#: ../../locales/../src/interface/LocalTreeView.cpp:621 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:613 +#: ../../locales/../src/interface/LocalTreeView.cpp:609 msgid "Failed to get desktop path" msgstr "Gặp lỗi khi lấy đường dẫn desktop" -#: ../../locales/../src/interface/netconfwizard.cpp:960 +#: ../../locales/../src/interface/netconfwizard.cpp:944 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:967 +#: ../../locales/../src/interface/netconfwizard.cpp:951 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." @@ -3708,79 +3727,84 @@ msgid "Failed to initialize FTP engine" msgstr "Khởi tạo bộ máy FTP gặp lỗi." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:390 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:752 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:290 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "Gặp lỗi khi khởi tạo TLS." +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "Khởi tạo bộ máy FTP gặp lỗi." + #: ../../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:124 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:123 #, c-format msgid "Failed to load private key: %s" msgstr "Lỗi tải khóa riêng: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2490 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, 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:2556 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, 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:2522 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:1007 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, 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:344 +#: ../../locales/../src/engine/ControlSocket.cpp:347 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:1022 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "Nhận dữ liệu dữ liệu gặp lỗi" -#: ../../locales/../src/engine/ControlSocket.cpp:191 +#: ../../locales/../src/engine/ControlSocket.cpp:193 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:730 +#: ../../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:3779 +#: ../../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:3800 +#: ../../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:706 +#: ../../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:631 +#: ../../locales/../src/interface/netconfwizard.cpp:625 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:322 +#: ../../locales/../src/interface/netconfwizard.cpp:313 msgid "Failed to send command." msgstr "Gửi lệnh đi gặp lỗi." -#: ../../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 "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:130 +#: ../../locales/../src/interface/FileZilla.cpp:151 #, c-format msgid "" "Failed to set language to %s (%s), using default system language (%s, %s)." @@ -3788,25 +3812,25 @@ "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:119 +#: ../../locales/../src/interface/FileZilla.cpp:140 #, 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: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 "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:126 +#: ../../locales/../src/interface/FileZilla.cpp:147 #, 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:116 +#: ../../locales/../src/interface/FileZilla.cpp:137 #, 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." @@ -3815,11 +3839,11 @@ msgid "Failed to validate settings" msgstr "Gặp lỗi khi cài đặt xác nhận" -#: ../../locales/../src/engine/tlssocket.cpp:1024 +#: ../../locales/../src/engine/tlssocket.cpp:1107 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:520 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:523 #, c-format msgid "Failed to write to file %s" msgstr "Ghi tập tin %s gặp lỗi" @@ -3852,7 +3876,7 @@ msgid "File Types" msgstr "Kiểu tập tin" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "Bộ mô tả tập tin không phải là một ổ cắm" @@ -3864,7 +3888,7 @@ msgid "File editing" msgstr "Chỉnh sửa tập tin" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "Tập tin đã có sẵn" @@ -3881,8 +3905,8 @@ msgstr "Danh sách các tập tin" #: ../../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 "Tập tin không tìm thấy" @@ -3891,38 +3915,38 @@ msgid "File search" msgstr "Tìm kiếm tập tin" -#: ../../locales/../src/engine/ControlSocket.cpp:125 +#: ../../locales/../src/engine/ControlSocket.cpp:127 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:116 +#: ../../locales/../src/engine/ControlSocket.cpp:118 #, 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:135 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "Tập tin được truyền đi không thành công" -#: ../../locales/../src/engine/ControlSocket.cpp:120 +#: ../../locales/../src/engine/ControlSocket.cpp:122 #, 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:130 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "Các lần truyền bị bỏ qua" -#: ../../locales/../src/engine/ControlSocket.cpp:128 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "Tập tin được truyền đi thành công" -#: ../../locales/../src/engine/ControlSocket.cpp:113 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, 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:1127 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "Tập tin truyền đi vẫn đang trong tiến trình." @@ -3934,7 +3958,7 @@ 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:407 +#: ../../locales/../src/interface/FileZilla.cpp:429 #: ../../locales/../src/interface/quickconnectbar.cpp:66 #: ../../locales/../src/interface/quickconnectbar.cpp:204 msgid "FileZilla Error" @@ -3947,11 +3971,11 @@ 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:3478 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3485 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:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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." @@ -3965,7 +3989,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 @@ -3976,13 +4000,13 @@ msgid "Filename &filters..." msgstr "Tên tệ&p tin của bộ lọc…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2968 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2173 +#: ../../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 "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:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "Tên tập tin không hợp lệ" @@ -4010,7 +4034,7 @@ 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:275 +#: ../../locales/../src/interface/LocalListView.cpp:277 #: ../../locales/../src/interface/RemoteListView.cpp:374 #: ../../locales/../src/interface/search.cpp:110 msgid "Filesize" @@ -4020,7 +4044,7 @@ msgid "Filesize format" msgstr "Định dạng kích thước tập tin" -#: ../../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" @@ -4058,8 +4082,8 @@ 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: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 "Bộ lọc này đã có rồi" @@ -4073,11 +4097,11 @@ msgid "Filter validation failed" msgstr "Bộ lọc không hợp lệ" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "Tìm các tậ&p tin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "Tìm các t&hư mục" @@ -4094,7 +4118,7 @@ msgid "Fingerprint:" msgstr "Dấu vân tay:" -#: ../../locales/../src/interface/netconfwizard.cpp:57 +#: ../../locales/../src/interface/netconfwizard.cpp:55 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" @@ -4126,7 +4150,7 @@ msgid "Force showing &hidden files" msgstr "&Hiển thị tập tin ẩn" -#: ../../locales/../src/interface/Mainfrm.cpp:635 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "Hiển thị các tập tin ẩn" @@ -4141,12 +4165,12 @@ "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:646 +#: ../../locales/../src/interface/updater.cpp:647 #, 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:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "Nhiều tài liệu khác" @@ -4154,7 +4178,7 @@ msgid "General" msgstr "Chung" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "GÓI MẠNG máy chủ chung gặp lỗi" @@ -4167,12 +4191,12 @@ 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:3397 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3404 msgid "Getting help" msgstr "Tìm trợ giúp" -#: ../../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 "" "Đặ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 " @@ -4182,22 +4206,22 @@ msgid "Global bookmarks" msgstr "Dấu trang toàn cục" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "Lỗi GnuTLS %d" -#: ../../locales/../src/engine/tlssocket.cpp:186 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "Lỗi GnuTLS %d trong %s" -#: ../../locales/../src/engine/tlssocket.cpp:180 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "Lỗi GnuTLS %d trong %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:178 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "Lỗi GnuTLS %d : %s" @@ -4227,17 +4251,17 @@ msgstr "Ẩn" #: ../../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 "Cao" -#: ../../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 "Cao nhất" -#: ../../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 chỉ cổng cao nhất có thể phải là số từ 1024 đến 65535." @@ -4251,7 +4275,7 @@ msgid "Homepage:" msgstr "Trang chủ:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "Máy chủ bị ngừng hoạt động" @@ -4267,7 +4291,7 @@ 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:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "Máy không thể tiếp cận" @@ -4286,7 +4310,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (ví dụ: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 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" @@ -4334,7 +4358,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:569 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." @@ -4342,7 +4366,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:578 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4360,7 +4384,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: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." @@ -4368,7 +4392,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:639 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." @@ -4376,7 +4400,7 @@ "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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:591 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 " @@ -4389,9 +4413,9 @@ "the server. If the time differs (e.g. different timezone), specify a " "timezone offset in the site manager." msgstr "" -"Nếu việc dùng “ghi đè lên nếu mới hơn”, thời gian hệ thống của bạn phải được " -"đồng 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 thời gian trong Danh bạ." +"Nếu dùng “ghi đè lên nếu mới hơn”, thời gian hệ thống của bạn phải được đồng " +"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 msgid "" @@ -4413,7 +4437,7 @@ "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:1149 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 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." @@ -4437,7 +4461,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:584 +#: ../../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 " @@ -4473,7 +4497,7 @@ "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:610 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4534,7 +4558,7 @@ "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:1036 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" @@ -4542,7 +4566,7 @@ "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:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "Mật khẩu sai" @@ -4553,17 +4577,21 @@ 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:743 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "Đang khởi tạo TLS…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:727 +#: ../../locales/../src/interface/verifycertdialog.cpp:107 +msgid "Insecure algorithm!" +msgstr "Thuật không an toàn!" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "Tính tương tác" @@ -4571,29 +4599,29 @@ msgid "Interface" msgstr "Giao diện" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "Bị ngắt bởi tín hiệu" -#: ../../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 "Bị ngắt bởi người dùng" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 msgid "Invalid Content-Length" msgstr "Độ dài của nội dung không hợp lệ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:576 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:579 msgid "Invalid HTTP Response" -msgstr "HTTP trả lời không hợp lệ" +msgstr "Trả lời HTTP không hợp lệ" -#: ../../locales/../src/engine/socket.cpp:1050 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "Đối số đã chuyển qua không hợp lệ" -#: ../../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." @@ -4601,18 +4629,19 @@ "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:840 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:843 msgid "Invalid chunk size" msgstr "Tổng kiểm tra kích thước không đúng" -#: ../../locales/../src/interface/netconfwizard.cpp:368 -#: ../../locales/../src/interface/netconfwizard.cpp:378 -#: ../../locales/../src/interface/netconfwizard.cpp:387 +#: ../../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 "Dữ liệu nhận về không hợp lệ" -#: ../../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 "Ngày tháng không hợp lệ" @@ -4652,38 +4681,38 @@ "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:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 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:402 +#: ../../locales/../src/interface/search.cpp:405 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:586 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:589 msgid "Invalid response code" msgstr "Mã đáp ứng sai" -#: ../../locales/../src/interface/search.cpp:397 +#: ../../locales/../src/interface/search.cpp:400 #, 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: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 "Đường dẫn địa chỉ không hợp lệ" @@ -4695,23 +4724,23 @@ msgid "Invalid username given." msgstr "Tên người dùng đã cho không hợp lệ." -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "Giá trị không hợp lệ cho ai_flags" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "Giá trị cần gợi ý không hợp lệ" -#: ../../locales/../src/interface/verifycertdialog.cpp:228 +#: ../../locales/../src/interface/verifycertdialog.cpp:252 msgid "Jurisdiction country:" msgstr "Khu vực của quốc gia:" -#: ../../locales/../src/interface/verifycertdialog.cpp:230 +#: ../../locales/../src/interface/verifycertdialog.cpp:254 msgid "Jurisdiction locality:" msgstr "Khu vực của vùng:" -#: ../../locales/../src/interface/verifycertdialog.cpp:229 +#: ../../locales/../src/interface/verifycertdialog.cpp:253 msgid "Jurisdiction state or province:" msgstr "Khu vực của bang hay tỉnh:" @@ -4719,7 +4748,7 @@ msgid "Keep directories on top" msgstr "Giữ thư mục ở trên cao nhất" -#: ../../locales/../src/interface/Mainfrm.cpp:639 +#: ../../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 " @@ -4754,11 +4783,11 @@ msgid "Language" msgstr "Ngôn ngữ" -#: ../../locales/../src/interface/Mainfrm.cpp:1456 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "Language changed" msgstr "Ngôn ngữ đã thay đổi" -#: ../../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" @@ -4788,7 +4817,7 @@ msgid "Limit:" msgstr "Giới hạn:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "Vượt quá độ dài dòng" @@ -4796,13 +4825,14 @@ msgid "Linked against" msgstr "Dùng các thư viện:" -#: ../../locales/../src/interface/netconfwizard.cpp:282 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "Gói mạng để nghe bị đóng lại" -#: ../../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 "Danh sách:" @@ -4815,11 +4845,11 @@ msgid "Local" msgstr "Máy nội bộ" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "Địa chỉ cục bộ được dùng" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "Điểm cuối nội bộ đã bị đóng lại" @@ -4827,21 +4857,21 @@ msgid "Local file" msgstr "Tập tin nội bộ" -#: ../../locales/../src/interface/manual_transfer.cpp:312 +#: ../../locales/../src/interface/manual_transfer.cpp:313 msgid "Local file does not exist." msgstr "Tập tin nội bộ không tồn tại." -#: ../../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 "Tập tin nội bộ là %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 "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:349 +#: ../../locales/../src/interface/manual_transfer.cpp:350 msgid "Local file is not a valid filename." msgstr "Tên tập tin nội bộ không hợp lệ." @@ -4853,7 +4883,7 @@ msgid "Local site:" msgstr "Địa chỉ máy nội bộ:" -#: ../../locales/../src/interface/verifycertdialog.cpp:222 +#: ../../locales/../src/interface/verifycertdialog.cpp:246 msgid "Locality:" msgstr "Vị trí:" @@ -4866,7 +4896,7 @@ msgid "Logging" msgstr "Đăng nhập" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:801 +#: ../../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." @@ -4875,7 +4905,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:808 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:811 msgid "" "Login data contains non-ASCII characters and server might not be UTF-8 " "aware. Trying local charset." @@ -4883,7 +4913,7 @@ "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:835 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 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ỏ." @@ -4903,17 +4933,17 @@ "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:899 -#: ../../locales/../src/interface/queue.cpp:986 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "Thấp" -#: ../../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 "Thấp nhất" -#: ../../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 "Giá trị cổng thấp nhất phải là số nằm giữa 1024 và 65535." @@ -4927,44 +4957,44 @@ "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: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 "Mẩu dữ liệu sai lệch: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:726 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:729 #, c-format msgid "Malformed header: %s" msgstr "Phần đầu sai lệch: %s" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:546 +#: ../../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: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 "Truyền thủ công" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3027 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:3021 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3028 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:3022 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3029 msgid "Match none of the following" msgstr "Không tương ứng với tất cả cái như sau" @@ -4972,12 +5002,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "Tối đa số truyền đi đồng &thời:" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 msgid "Memory allocation failure" msgstr "Gặp lỗi nghiêm trọng khi phân bổ bộ nhớ" -#: ../../locales/../src/interface/Mainfrm.cpp:387 -#: ../../locales/../src/interface/Mainfrm.cpp:1783 +#: ../../locales/../src/interface/Mainfrm.cpp:388 +#: ../../locales/../src/interface/Mainfrm.cpp:1752 msgid "Message log" msgstr "Nhật ký thông tin" @@ -4985,7 +5015,7 @@ msgid "Message log position" msgstr "Vị trí của nhật ký thông báo" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "Thông điệp quá lớn" @@ -5005,15 +5035,15 @@ msgid "Move &up" msgstr "Di chuyển &lên" -#: ../../locales/../src/interface/LocalTreeView.cpp:977 +#: ../../locales/../src/interface/LocalTreeView.cpp:974 msgid "My Computer" msgstr "Thư mục My Computer" -#: ../../locales/../src/interface/LocalTreeView.cpp:967 +#: ../../locales/../src/interface/LocalTreeView.cpp:964 msgid "My Documents" msgstr "Thư mục My Documents" -#: ../../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" @@ -5034,7 +5064,7 @@ msgstr "Tên đã có rồi" #: ../../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 "Tên dấu trang đã sẵn có." @@ -5050,7 +5080,7 @@ msgid "Need to enter filter name" msgstr "Phải nhập tên bộ lọc" -#: ../../locales/../src/interface/search.cpp:388 +#: ../../locales/../src/interface/search.cpp:391 msgid "Need to enter valid remote path" msgstr "Phải nhập đường dẫn máy mạng hợp lệ" @@ -5058,18 +5088,18 @@ msgid "Need to specify a character encoding" msgstr "Cần chỉ rõ bộ mã ký tự" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 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:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:490 -#: ../../locales/../src/engine/socket.cpp:1064 +#: ../../locales/../src/engine/proxy.cpp:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "Mạng máy tính không kết nối tới" @@ -5085,7 +5115,7 @@ msgid "New &tab" msgstr "&Tab mới" -#: ../../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 "Tạo &mới" @@ -5104,14 +5134,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 "Tạo dấu trang mới" -#: ../../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 "Thư &mục mới" @@ -5128,9 +5158,9 @@ msgid "New folder" msgstr "Thư mục mới" -#: ../../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 "Tạo địa chỉ mới" @@ -5138,11 +5168,11 @@ msgid "Next to the transfer queue" msgstr "Hàng đợi truyền tiếp theo" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "Không" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "Chưa có địa chỉ tổ hợp với tên nốt này" @@ -5150,11 +5180,11 @@ msgid "No category to export selected" msgstr "Không có category để xuất ra được chọn" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 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:3751 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 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." @@ -5176,27 +5206,27 @@ msgid "No images available" msgstr "Không có ảnh nào có thể dùng được" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../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: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 "Không có tên cho bộ lọc nhận được." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2985 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2992 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: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 "" "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:1067 +#: ../../locales/../src/engine/socket.cpp:1053 msgid "No route to host" msgstr "Không có bộ định tuyến đến máy" @@ -5204,11 +5234,11 @@ msgid "No search results" msgstr "Không tìm thấy" -#: ../../locales/../src/interface/sitemanager.cpp:278 +#: ../../locales/../src/interface/sitemanager.cpp:280 msgid "No sites available" msgstr "Chưa có địa chỉ nào có thể dùng" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "Không hỗ trợ phương thức xác minh SOCKS5" @@ -5218,7 +5248,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 "Không" @@ -5226,18 +5256,18 @@ msgid "None selected yet" msgstr "Chưa có gì được chọn" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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: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/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 "Bình thường" @@ -5247,16 +5277,16 @@ 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:179 -#: ../../locales/../src/interface/state.cpp:482 +#: ../../locales/../src/interface/state.cpp:180 +#: ../../locales/../src/interface/state.cpp:483 msgid "Not connected" msgstr "Chưa được kết nối" -#: ../../locales/../src/interface/RemoteListView.cpp:2021 +#: ../../locales/../src/interface/RemoteListView.cpp:2011 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:551 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "Không có bất kỳ kết nối tới máy chủ." @@ -5264,11 +5294,11 @@ msgid "Not connected." msgstr "Chưa được kết nối." -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 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:637 +#: ../../locales/../src/interface/Mainfrm.cpp:647 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." @@ -5310,13 +5340,13 @@ #: ../../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" @@ -5334,7 +5364,7 @@ "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:849 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "Một lần" @@ -5380,8 +5410,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 "Mở bị lỗi" @@ -5404,19 +5434,19 @@ msgid "Operating System:" msgstr "Hệ điều hành:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "Thao tác đã có sẵn trong tiến trình xử lý" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "Thao tác đang được xử lý" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "Thao tác không được hỗ trợ" -#: ../../locales/../src/interface/verifycertdialog.cpp:216 +#: ../../locales/../src/interface/verifycertdialog.cpp:240 msgid "Organization:" msgstr "Tổ chức:" @@ -5424,16 +5454,16 @@ msgid "Other SFTP options" msgstr "Các tùy chọn SFTP khác" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "Lỗi hệ thống khác" -#: ../../locales/../src/interface/verifycertdialog.cpp:238 +#: ../../locales/../src/interface/verifycertdialog.cpp:262 msgid "Other:" msgstr "Cái khác:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "Hết bộ nhớ" @@ -5481,7 +5511,7 @@ 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:218 +#: ../../locales/../src/interface/updater.cpp:219 #, c-format msgid "Own build type: %s\n" msgstr "Kiểu biên dịch chủ thể: %s\n" @@ -5508,7 +5538,7 @@ msgid "P&roxy host:" msgstr "Máy chủ ủy thá&c proxy:" -#: ../../locales/../src/interface/netconfwizard.cpp:503 +#: ../../locales/../src/interface/netconfwizard.cpp:497 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." @@ -5516,11 +5546,11 @@ msgid "Pa&ssive (recommended)" msgstr "Thụ độn&g (nên dùng)" -#: ../../locales/../src/interface/Mainfrm.cpp:2355 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "Tham số không hợp chuẩn URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, 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" @@ -5540,13 +5570,13 @@ msgid "Passive mode" msgstr "Chế độ thụ động" -#: ../../locales/../src/interface/netconfwizard.cpp:603 -#: ../../locales/../src/interface/netconfwizard.cpp:616 -#: ../../locales/../src/interface/netconfwizard.cpp:627 +#: ../../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 "Chế độ thụ động được đặt là chế độ truyền mặc định." -#: ../../locales/../src/interface/fzputtygen_interface.cpp:112 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:111 msgid "Password required" msgstr "Yêu cầu mật khẩu" @@ -5555,13 +5585,13 @@ msgid "Path" msgstr "Đường dẫn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3051 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2219 +#: ../../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 "Đườ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:2313 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "Không tìm thấy đường dẫn:" @@ -5580,8 +5610,8 @@ msgid "Permission" msgstr "Quyền" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "Không đủ thẩm quyền" @@ -5594,7 +5624,7 @@ msgid "Platform:" msgstr "Nền tảng:" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../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." @@ -5610,13 +5640,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:638 +#: ../../locales/../src/interface/netconfwizard.cpp:632 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:577 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5651,7 +5681,7 @@ 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:389 +#: ../../locales/../src/interface/filter.cpp:390 #, 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\"." @@ -5681,15 +5711,15 @@ 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:2112 +#: ../../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:\\somePath\\file.exe nếu chạy trên MS Windows hay /somePath/file nếu " -"dưới Unix.\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 @@ -5699,7 +5729,7 @@ "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:333 +#: ../../locales/../src/interface/filter.cpp:334 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" @@ -5707,11 +5737,11 @@ 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:197 +#: ../../locales/../src/interface/netconfwizard.cpp:187 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:176 +#: ../../locales/../src/interface/netconfwizard.cpp:168 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ừ đó" @@ -5722,7 +5752,7 @@ 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:562 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5730,14 +5760,14 @@ "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: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 "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:2619 +#: ../../locales/../src/interface/RemoteListView.cpp:2609 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:" @@ -5745,12 +5775,12 @@ 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:157 +#: ../../locales/../src/interface/netconfwizard.cpp:152 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:608 -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../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 " @@ -5768,7 +5798,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:632 +#: ../../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." @@ -5776,13 +5806,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:136 +#: ../../locales/../src/interface/FileZilla.cpp:157 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:609 +#: ../../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 " @@ -5806,7 +5836,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:677 +#: ../../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." @@ -5822,7 +5852,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:585 +#: ../../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 " @@ -5832,7 +5862,7 @@ "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:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "Hãy chọn tác động:" @@ -5867,7 +5897,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:596 +#: ../../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. " @@ -5885,8 +5915,8 @@ msgid "Positio&n of the message log:" msgstr "&Vị trí của nhật ký:" -#: ../../locales/../src/interface/verifycertdialog.cpp:223 -#: ../../locales/../src/interface/verifycertdialog.cpp:224 +#: ../../locales/../src/interface/verifycertdialog.cpp:247 +#: ../../locales/../src/interface/verifycertdialog.cpp:248 msgid "Postal code:" msgstr "Mã bưu điện:" @@ -5898,12 +5928,12 @@ msgid "Preallocation" msgstr "Cấp phát trước" -#: ../../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 "Giới hạn trước các địa chỉ" -#: ../../locales/../src/interface/Mainfrm.cpp:676 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "Lưu giữ dấu thời gian của tập tin" @@ -5911,7 +5941,7 @@ msgid "Preview:" msgstr "Xem trước:" -#: ../../locales/../src/engine/tlssocket.cpp:1053 +#: ../../locales/../src/engine/tlssocket.cpp:1136 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." @@ -5922,13 +5952,13 @@ #: ../../locales/../src/interface/cmdline.cpp:18 msgid "Print version information to stdout and exit" -msgstr "Gửi thông tin về phiên bản tới stdout và thoát ra" +msgstr "In thông tin về phiên bản ra stdout rồi thoát" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1733 msgid "Prioritize directories (default)" msgstr "Thư mục ưu tiên (mặc định)" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "Quyền ưu tiên" @@ -5958,7 +5988,7 @@ msgid "Process &Queue" msgstr "Xử lý &hàng đợi" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "Bản tập tin xử lý bị tràn" @@ -5968,11 +5998,11 @@ msgid "Processed %s in %s." msgstr "Đã xử lý %s trong %s." -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "Giao thức không được hỗ trợ" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "Giao thức không hỗ trợ trên kiểu ổ cắm đã cho" @@ -5989,38 +6019,42 @@ msgid "Proxy &user:" msgstr "Tài khoả&n máy chủ ủy nhiệm:" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "Sự xác thực máy chủ ủy nhiệm bị lỗi." -#: ../../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 "Kết nối bắt tay với máy chủ ủy nhiệm bị lỗi: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4206 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 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:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, c-format msgid "Proxy reply: %s" msgstr "Máy chủ ủy nhiệm trả lời: %s" -#: ../../locales/../src/engine/proxy.cpp:384 -#: ../../locales/../src/engine/proxy.cpp:512 +#: ../../locales/../src/engine/proxy.cpp:535 +#, 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 #, c-format msgid "Proxy request failed: %s" -msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm lỗi: %s" +msgstr "Gặp lỗi khi yêu cầu máy chủ ủy nhiệm: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 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 lỗi: Không rõ kiểu địa chỉ trong trả " -"lời CONNECT" +"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:4235 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 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ệ" @@ -6036,7 +6070,7 @@ msgid "Public permissions" msgstr "Cho phép tất cả mọi người" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "Hàng đợi đã đầy" @@ -6055,11 +6089,11 @@ msgid "Queue: empty" msgstr "Hàng đợi: rỗng" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "Hàng đợi các tập tin" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "Đang đợi:" @@ -6076,7 +6110,7 @@ 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:576 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "Lệnh FTP thô" @@ -6093,7 +6127,7 @@ msgid "Re&name" msgstr "Đổi tê&n" -#: ../../locales/../src/interface/netconfwizard.cpp:591 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -6109,12 +6143,12 @@ msgid "Read-only" msgstr "Chỉ đọc" -#: ../../locales/../src/interface/Mainfrm.cpp:1013 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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: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 "" @@ -6122,36 +6156,36 @@ 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: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] "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: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 "Bạn có thực sự muốn xóa %s và %s từ máy chủ không?" -#: ../../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 "" "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ủ " "không?" -#: ../../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 "" "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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "Lý do" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "Khởi động lại ngay" @@ -6159,36 +6193,36 @@ msgid "Rec&urse into subdirectories" msgstr "Rec&urse vào thư mục con" -#: ../../locales/../src/engine/tlssocket.cpp:197 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, 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:2965 +#: ../../locales/../src/engine/directorylistingparser.cpp:2957 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: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 "Nhận được vượt quá 10000 ký tự một dòng, đang bãi bỏ." -#: ../../locales/../src/interface/netconfwizard.cpp:1006 -#: ../../locales/../src/interface/netconfwizard.cpp:1015 -#: ../../locales/../src/interface/netconfwizard.cpp:1038 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "Xác nhận dữ liệu bị hỏng" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 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:200 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:514 +#: ../../locales/../src/interface/updater.cpp:515 msgid "Received version information is too large" msgstr "Thông tin về phiên bản nhận được là quá dài" @@ -6221,13 +6255,13 @@ 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:642 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:645 #, 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: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 "Đổi hướng tới địa chỉ không hợp lệ hoặc không được hỗ trợ: %s" @@ -6237,7 +6271,7 @@ 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:3690 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3697 msgid "Remember passwords?" msgstr "Nhớ mật khẩu?" @@ -6245,20 +6279,20 @@ msgid "Remote" msgstr "Máy trên mạng" -#: ../../locales/../src/engine/tlssocket.cpp:826 +#: ../../locales/../src/engine/tlssocket.cpp:854 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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Remote file" msgstr "Tập tin máy mạng" -#: ../../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 "Tìm kiếm tập tin máy mạng" @@ -6294,11 +6328,11 @@ 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:331 +#: ../../locales/../src/interface/manual_transfer.cpp:332 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:3139 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3146 msgid "Remote path handling:" msgstr "Đường dẫn máy mạng đang xử lý:" @@ -6338,30 +6372,30 @@ msgid "Rename selected files and directories" msgstr "Đổi tên tập tin và thư mục đã chọn" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3390 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2418 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2419 #, c-format msgid "Renaming '%s' to '%s'" msgstr "Đổi tên từ “%s” thành “%s”" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3415 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3422 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:375 +#: ../../locales/../src/engine/proxy.cpp:398 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:378 +#: ../../locales/../src/engine/proxy.cpp:401 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:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "Yêu cầu bị từ chối hay gặp lỗi" @@ -6377,28 +6411,28 @@ msgid "Reset and requeue &all" msgstr "Đặt và xếp lại toàn &bộ hàng đợi" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "Giao thức phân giải chưa biết" -#: ../../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 "Phân giải địa chỉ IP của %s" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "Tài nguyên tạm thời không sẵn sàng" -#: ../../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:411 +#: ../../locales/../src/interface/StatusView.cpp:286 +#: ../../locales/../src/interface/StatusView.cpp:346 msgid "Response:" msgstr "Trả về:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "Kết quả:" @@ -6417,19 +6451,19 @@ "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:1270 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:928 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, 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:1267 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:925 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "Đang nhận danh sách thư mục…" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3766 -#: ../../locales/../src/interface/netconfwizard.cpp:719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "Nhận địa chỉ IP từ %s" @@ -6446,7 +6480,7 @@ msgid "S&hutdown system" msgstr "Tắt &hệ thống" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "&Dừng lại" @@ -6466,7 +6500,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "Máy chủ ủy nhiệm SOCKS4 sẽ kết nối đến: %s" @@ -6475,16 +6509,16 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "Save settings?" msgstr "Lưu lại các cài đặt không?" -#: ../../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 "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: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 "Việc lưu mật khẩu đã được tắt bởi chính bạn." @@ -6497,11 +6531,11 @@ 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/dialogs.xrc:3013 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3020 msgid "Search &conditions:" msgstr "Điều &kiện tìm kiếm:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2994 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3001 msgid "Search &directory:" msgstr "&Thư mục tìm kiếm:" @@ -6517,8 +6551,8 @@ msgid "Security information" msgstr "Thông tin an ninh" -#: ../../locales/../src/interface/netconfwizard.cpp:579 -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "Xem thêm: http://wiki.filezilla-project.org/Network_Configuration" @@ -6571,7 +6605,7 @@ msgstr "Chọn tập tin cho dữ liệu xuất ra" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1488 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "Chọn tập tin cho hàng đợi xuất ra" @@ -6580,7 +6614,7 @@ 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:2208 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2211 msgid "Select file for exported sites" msgstr "Chọn tập tin cho địa chỉ xuất ra" @@ -6588,23 +6622,23 @@ 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:241 +#: ../../locales/../src/interface/manual_transfer.cpp:242 msgid "Select file to upload" msgstr "Chọn tập tin để tải lên" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:129 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 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:2907 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2914 msgid "Select how these files should be opened." msgstr "Chọn cách mở tập tin." -#: ../../locales/../src/interface/search.cpp:507 +#: ../../locales/../src/interface/search.cpp:513 msgid "Select target download directory" msgstr "Chọn thư mục đích để tải về" -#: ../../locales/../src/interface/manual_transfer.cpp:237 +#: ../../locales/../src/interface/manual_transfer.cpp:238 msgid "Select target filename" msgstr "Chọn tên tập tin đích" @@ -6616,7 +6650,7 @@ 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: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." @@ -6628,7 +6662,7 @@ msgid_plural "Selected %d directories." msgstr[0] "Đã chọn %d thư mục" -#: ../../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." @@ -6646,7 +6680,7 @@ 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:479 +#: ../../locales/../src/interface/search.cpp:485 #, c-format msgid "Selected %s and %s for transfer." msgstr "Đã chọn %s và %s để truyền." @@ -6684,7 +6718,7 @@ 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:303 +#: ../../locales/../src/interface/filter.cpp:304 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ộ." @@ -6708,12 +6742,12 @@ 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:4311 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 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:227 +#: ../../locales/../src/interface/verifycertdialog.cpp:251 msgid "Serial number:" msgstr "Số sê-ri:" @@ -6721,21 +6755,21 @@ msgid "Server &Type:" msgstr "&Kiểu máy chủ:" -#: ../../locales/../src/engine/tlssocket.cpp:715 +#: ../../locales/../src/engine/tlssocket.cpp:743 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:888 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:941 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 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:4147 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, 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:4143 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 #, c-format msgid "" "Server does not support resume of files > %d GB. End transfer since file " @@ -6744,15 +6778,15 @@ "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:2424 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 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:2420 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 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:4158 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4179 #, c-format msgid "" "Server may not support resume of files > %d GB. End transfer since file " @@ -6761,7 +6795,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:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" @@ -6769,24 +6803,24 @@ "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:342 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "Máy chủ trả về đường dẫn rỗng." -#: ../../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 "" "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:3713 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 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:3708 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." @@ -6795,14 +6829,14 @@ "để thay thế." #: ../../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: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 "Máy chủ gửi trả lời không hợp lệ." @@ -6818,7 +6852,7 @@ msgid "Server&type:" msgstr "&Kiểu máy chủ:" -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "Tập tin Máy chủ/Máy nội bộ" @@ -6835,13 +6869,13 @@ msgid "Set &Priority" msgstr "T&hiết lập quyền ưu tiên" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3538 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2297 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "Thiết lập quyền hạn từ “%s” thành “%s”" -#: ../../locales/../src/engine/transfersocket.cpp:789 +#: ../../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" @@ -6861,7 +6895,7 @@ msgid "Show &welcome dialog..." msgstr "Hiển thị hộp thoại &chào mừng…" -#: ../../locales/../src/interface/Mainfrm.cpp:2203 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 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?" @@ -6882,7 +6916,7 @@ msgid "Shows this help dialog" msgstr "Hiển thị hộp thoại trợ giúp" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "Tắt ngay bây giờ" @@ -6922,23 +6956,23 @@ msgid "Site Manager already open" msgstr "Danh bạ đã mở" -#: ../../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 "Địa chỉ không tồn tại." -#: ../../locales/../src/interface/sitemanager.cpp:409 +#: ../../locales/../src/interface/sitemanager.cpp:411 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: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 "Địa chỉ trang mạng không hợp lệ." @@ -6956,7 +6990,7 @@ "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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "Kích thước" @@ -6975,43 +7009,43 @@ msgid "Skip file" msgstr "Bỏ qua tập tin" -#: ../../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 "Giữ nguyên tải xuống của %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 "Giữ nguyên tải lên của %s" -#: ../../locales/../src/engine/socket.cpp:1061 +#: ../../locales/../src/engine/socket.cpp:1047 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:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "Ổ cắm đã sẵn được kết nối" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "Ổ cắm bị tắt" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "Ổ cắm chưa được kết nối" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 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:1148 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 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." @@ -7028,7 +7062,7 @@ msgid "Sort directories inline" msgstr "Xắp xếp thư mục trực tiếp" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 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." @@ -7044,7 +7078,7 @@ 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:139 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:138 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" @@ -7056,7 +7090,7 @@ msgid "Source file:" msgstr "Tập tin nguồn:" -#: ../../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" @@ -7094,19 +7128,19 @@ msgid "Start with opened Site Manager" msgstr "Bắt đầu bằng việc mở Danh bạ" -#: ../../locales/../src/interface/updater.cpp:212 +#: ../../locales/../src/interface/updater.cpp:213 #, 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:2144 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1562 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "Bắt đầu tải về %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1565 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "Bắt đầu tải lên %s" @@ -7115,18 +7149,18 @@ 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:221 +#: ../../locales/../src/interface/verifycertdialog.cpp:245 msgid "State or province:" msgstr "Bang hoặc tỉnh:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "Tình trạng" -#: ../../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 "Tình trạng:" @@ -7138,7 +7172,7 @@ msgid "Stop recursive operation" msgstr "Dừng thao tác đệ quy" -#: ../../locales/../src/interface/verifycertdialog.cpp:225 +#: ../../locales/../src/interface/verifycertdialog.cpp:249 msgid "Street:" msgstr "Tên đường phố:" @@ -7154,11 +7188,11 @@ msgid "Summary of test results:" msgstr "Tổng hợp kết quả kiểm tra:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 msgid "Suspend now" msgstr "Ngừng ngay bây giờ" -#: ../../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." @@ -7166,24 +7200,24 @@ "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: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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "Duyệt đồng bộ" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "Chức năng duyệt đồng bộ đã bị khóa." @@ -7197,8 +7231,8 @@ #: ../../locales/../src/interface/cmdline.cpp:88 #: ../../locales/../src/interface/cmdline.cpp:97 #: ../../locales/../src/interface/cmdline.cpp:103 -#: ../../locales/../src/interface/Mainfrm.cpp:2315 -#: ../../locales/../src/interface/Mainfrm.cpp:2357 +#: ../../locales/../src/interface/Mainfrm.cpp:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "Cấu trúc dòng lệnh sai" @@ -7210,11 +7244,11 @@ msgid "System details" msgstr "Chi tiết hệ thống" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 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:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "Hệ thống mạng con hệ thống bị lỗi" @@ -7222,19 +7256,19 @@ msgid "T&oolbar" msgstr "Thanh côn&g cụ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 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:402 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 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:405 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "Kết nối TLS đã được thiết lập." -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL đã hết hiệu lực" @@ -7246,15 +7280,15 @@ msgid "Target file:" msgstr "Tập tin đích:" -#: ../../locales/../src/interface/RemoteListView.cpp:2635 +#: ../../locales/../src/interface/RemoteListView.cpp:2625 msgid "Target filename already exists!" msgstr "Tập tin đích đã có sẵn từ trước!" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 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:1082 +#: ../../locales/../src/engine/socket.cpp:1068 msgid "Temporary failure in name resolution" msgstr "Tiến trình phân giải quyết bị lỗi tạm thời" @@ -7262,7 +7296,7 @@ msgid "Test results" msgstr "Kết quả kiểm tra" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "Kiểm tra khả năng phục hồi của máy chủ" @@ -7288,25 +7322,25 @@ "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:633 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, 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:1088 +#: ../../locales/../src/engine/socket.cpp:1074 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:1101 +#: ../../locales/../src/engine/socket.cpp:1087 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:663 +#: ../../locales/../src/interface/sitemanager.cpp:665 msgid "The bookmark could not be added." msgstr "Dấu trang không thể đặt thêm." -#: ../../locales/../src/interface/sitemanager.cpp:740 +#: ../../locales/../src/interface/sitemanager.cpp:742 msgid "The bookmarks could not be cleared." msgstr "Các dấu trang không thể xóa được." @@ -7332,17 +7366,17 @@ "Đị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:139 +#: ../../locales/../src/engine/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: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 "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:2918 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2925 #, 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”." @@ -7354,7 +7388,7 @@ 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/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 "Phần mở rộng “%s” đã được sẵn có từ trước trong danh sách" @@ -7370,7 +7404,7 @@ "Xin hãy nhập một cái tên mới:" #: ../../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" @@ -7401,7 +7435,7 @@ msgstr "Tập tin “%s” không thể tải lên được." #: ../../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" @@ -7411,7 +7445,7 @@ "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:1707 +#: ../../locales/../src/interface/LocalListView.cpp:1712 #, c-format msgid "" "The file '%s' could not be opened:\n" @@ -7433,7 +7467,7 @@ "liệu.\n" "Bạn có thực sự muốn tiếp tục không?" -#: ../../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" @@ -7482,7 +7516,7 @@ 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:3293 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3300 msgid "The free open source FTP solution" msgstr "Giải pháp FTP nguồn mở miễn phí" @@ -7504,17 +7538,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:979 +#: ../../locales/../src/interface/state.cpp:973 #, 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:964 +#: ../../locales/../src/interface/state.cpp:958 #, 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:249 +#: ../../locales/../src/interface/state.cpp:250 #, c-format msgid "" "The local directory '%s' is not below the synchronization root (%s).\n" @@ -7523,7 +7557,7 @@ "Thư mục nội bộ này (%s) không nằm dưới gốc đồng bộ hóa (%s).\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/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." @@ -7538,16 +7572,16 @@ 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:1832 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "Hàng đợi sẽ không được ghi lại." -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, 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:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7586,11 +7620,11 @@ "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:564 +#: ../../locales/../src/interface/sitemanager.cpp:566 msgid "The server could not be added." msgstr "Máy chủ không thể được đặt thêm." -#: ../../locales/../src/interface/netconfwizard.cpp:589 +#: ../../locales/../src/interface/netconfwizard.cpp:583 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." @@ -7624,7 +7658,7 @@ "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:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "Tham số servname không được hỗ trọ cho ai_socktype" @@ -7636,19 +7670,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:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "Họ địa chỉ đã cho không được hỗ trợ" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 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:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 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:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 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." @@ -7660,7 +7694,7 @@ "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:857 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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?" @@ -7674,15 +7708,15 @@ msgid "Themes" msgstr "Kiểu dáng" -#: ../../locales/../src/interface/filter.cpp:443 +#: ../../locales/../src/interface/filter.cpp:444 msgid "This filter set cannot be removed." msgstr "Bộ lọc này không thể xóa." -#: ../../locales/../src/interface/filter.cpp:383 +#: ../../locales/../src/interface/filter.cpp:384 msgid "This filter set cannot be renamed." msgstr "Không thể đổi tên bộ lọc này." -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7705,7 +7739,7 @@ "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:1203 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "Thời gian" @@ -7718,25 +7752,25 @@ msgstr "Số giâ&y chờ tối đa:" #: ../../locales/../src/interface/resources/xrc/settings.xrc:125 -#: ../../locales/../src/interface/queue.cpp:323 +#: ../../locales/../src/interface/queue.cpp:329 msgid "Timeout" msgstr "Quá giờ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1619 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1036 +#: ../../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:219 +#: ../../locales/../src/interface/verifycertdialog.cpp:243 msgid "Title:" msgstr "Tựa đề:" -#: ../../locales/../src/interface/Mainfrm.cpp:2201 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 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:2202 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 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ả." @@ -7799,17 +7833,17 @@ 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:558 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:561 msgid "Too long header line" msgstr "Đầu đề quá dài" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:633 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:636 msgid "Too many redirects" msgstr "Quá nhiều lần gửi lại" -#: ../../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 "Dấu vết:" @@ -7838,17 +7872,17 @@ msgid "Transfer Settings" msgstr "Cài đặt chế độ truyền" -#: ../../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 "Kết nối truyền bị ngắt: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:636 +#: ../../locales/../src/interface/netconfwizard.cpp:630 msgid "Transferred data got tainted." msgstr "Dữ liệu truyền đi bị hư hỏng." -#: ../../locales/../src/interface/queue.cpp:333 +#: ../../locales/../src/interface/queue.cpp:339 #: ../../locales/../src/interface/statuslinectrl.cpp:246 msgid "Transferring" msgstr "Đang truyền" @@ -7857,8 +7891,8 @@ msgid "Transfers" msgstr "Truyền" +#: ../../locales/../src/interface/QueueView.cpp:2944 #: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "Việc truyền đã hoàn thành" @@ -7870,11 +7904,11 @@ 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:835 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "Khóa đã thay đổi đáng tin cậy:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:833 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "Tin khóa mới:" @@ -7912,7 +7946,7 @@ msgid "U&pload" msgstr "Tải &lên" -#: ../../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 "Giới hạn tải &lên:" @@ -7922,20 +7956,20 @@ 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 -msgid "U&se system defaults" -msgstr "&Dùng hệ thống mặc định" +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 msgid "USER@&HOST" msgstr "TÀIK&HOẢN@MÁYCHỦ" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "Mã lỗi sai không xác định %d" -#: ../../locales/../src/interface/verifycertdialog.cpp:218 +#: ../../locales/../src/interface/verifycertdialog.cpp:242 msgid "Unit:" msgstr "Đơn vị:" @@ -7944,13 +7978,13 @@ msgid "Unknown" msgstr "Không rõ" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:683 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 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:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "Không rõ phiên bản giao thức SOCKS: %d" @@ -7963,7 +7997,7 @@ msgid "Unknown host key" msgstr "Không rõ khóa máy chủ" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7977,8 +8011,8 @@ "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:611 -#: ../../locales/../src/interface/netconfwizard.cpp:622 +#: ../../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." @@ -7986,7 +8020,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:598 +#: ../../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." @@ -7994,11 +8028,11 @@ "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:1015 +#: ../../locales/../src/engine/tlssocket.cpp:1098 msgid "Unsupported certificate type" msgstr "Kiểu giấy chứng nhận không được hỗ trợ" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:618 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:621 msgid "Unsupported redirect" msgstr "Gửi lại một lần nữa không được hỗ trợ" @@ -8068,12 +8102,12 @@ msgid "Use &custom editor:" msgstr "Dùng trình soạn thảo &riêng:" -#: ../../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ù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:2771 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2778 msgid "Use &synchronized browsing" msgstr "Dùng &duyệt đồng bộ" @@ -8099,8 +8133,8 @@ msgstr "Dùng máy chủ từ Danh bạ" #: ../../locales/../src/interface/resources/xrc/settings.xrc:1496 -msgid "Use system &defaults" -msgstr "Sử &dụng hệ thống mặc định" +msgid "Use system &defaults for current language" +msgstr "&Dùng hệ thống mặc định cho ngôn ngữ hiện tại" #: ../../locales/../src/interface/resources/xrc/netconfwizard.xrc:194 msgid "Use the following IP address:" @@ -8136,7 +8170,7 @@ msgid "User:" msgstr "Tài khoản:" -#: ../../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 "Tên người dùng không thể là một chuỗi khoảng trắng" @@ -8160,7 +8194,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "Nhật ký thông tin đầy đủ từ wxWidgets" -#: ../../locales/../src/engine/tlssocket.cpp:1065 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "Đang xác minh giấy phép…" @@ -8168,7 +8202,7 @@ msgid "Very high" msgstr "Rất cao" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1389 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 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ủ" @@ -8184,15 +8218,15 @@ msgid "W&rite" msgstr "&Ghi" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1671 msgid "Waiting" msgstr "Đang chờ" -#: ../../locales/../src/interface/queue.cpp:329 +#: ../../locales/../src/interface/queue.cpp:335 msgid "Waiting for browsing connection" msgstr "Đang chờ trình duyệt kết nối" -#: ../../locales/../src/interface/queue.cpp:330 +#: ../../locales/../src/interface/queue.cpp:336 msgid "Waiting for password" msgstr "Đang chờ mật khẩu" @@ -8204,7 +8238,7 @@ msgid "Waiting to retry..." msgstr "Đang thử lại xin chờ…" -#: ../../locales/../src/interface/netconfwizard.cpp:974 +#: ../../locales/../src/interface/netconfwizard.cpp:958 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." @@ -8226,11 +8260,11 @@ 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:3457 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3464 msgid "Welcome to FileZilla" msgstr "Chào các bạn đến với FileZilla" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3323 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3330 msgid "What's new" msgstr "Các điểm mới" @@ -8238,7 +8272,7 @@ msgid "What's new:" msgstr "Các điểm mới:" -#: ../../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." @@ -8262,7 +8296,7 @@ msgid "Widescreen" msgstr "Màn hình rộng" -#: ../../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 "Bạn có muốn FileZilla ghi nhớ mật khẩu?" @@ -8270,20 +8304,20 @@ msgid "Wr&ite" msgstr "&Ghi" -#: ../../locales/../src/interface/netconfwizard.cpp:448 -#: ../../locales/../src/interface/netconfwizard.cpp:455 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "Sai địa chỉ IP" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "Xuống dòng sai" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:847 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "Đồng ý" -#: ../../locales/../src/interface/netconfwizard.cpp:776 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8295,7 +8329,7 @@ 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:3432 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3439 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." @@ -8332,26 +8366,26 @@ 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:3211 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3218 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:725 +#: ../../locales/../src/interface/search.cpp:709 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: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 "" "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:414 +#: ../../locales/../src/interface/manual_transfer.cpp:415 #: ../../locales/../src/interface/sitemanager_dialog.cpp:954 msgid "You have to enter a hostname." msgstr "Bạn phải nhập tên máy chủ." @@ -8360,30 +8394,30 @@ 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:518 +#: ../../locales/../src/interface/search.cpp:524 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:164 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "Bạn phải nhập địa chỉ IP." +#: ../../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 "Bạn phải nhập một địa chỉ IPv4 hợp lệ." -#: ../../locales/../src/interface/search.cpp:523 +#: ../../locales/../src/interface/search.cpp:529 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:505 +#: ../../locales/../src/interface/manual_transfer.cpp:506 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1054 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:479 +#: ../../locales/../src/interface/manual_transfer.cpp:480 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1029 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:637 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8437,23 +8471,23 @@ "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:302 +#: ../../locales/../src/interface/manual_transfer.cpp:303 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:319 +#: ../../locales/../src/interface/manual_transfer.cpp:320 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:325 +#: ../../locales/../src/interface/manual_transfer.cpp:326 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:296 +#: ../../locales/../src/interface/manual_transfer.cpp:297 msgid "You need to specify a server." msgstr "Bạn phải chỉ ra một máy chủ." -#: ../../locales/../src/interface/netconfwizard.cpp:583 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." @@ -8461,7 +8495,7 @@ "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:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 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." @@ -8486,7 +8520,7 @@ msgid "contains" msgstr "có chứa" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "Tùy chỉnh" @@ -8508,19 +8542,19 @@ msgid "equals" msgstr "bằng nhau" -#: ../../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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 msgid "file" msgstr "tập tin" -#: ../../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 " @@ -8530,15 +8564,15 @@ "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:466 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 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:1489 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "không thể khởi động 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 không trả về chứng nhận nào cả." @@ -8594,10 +8628,10 @@ msgid "owner writeable" msgstr "người được phép ghi" -#: ../../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: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 "không rõ" @@ -8618,6 +8652,24 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Deleting directories" +#~ msgstr "Đang xóa các thư mục" + +#~ 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ợ" + +#~ msgid "Downloading multiple unrelated directories is not yet supported" +#~ msgstr "Việc bội tải xuống không liên quan đến thư mục vẫn chưa được hỗ trợ" + +#~ msgid "Downloading search results" +#~ msgstr "Đang tải về kết quả tìm kiếm" + +#~ msgid "U&se system defaults" +#~ msgstr "&Dùng hệ thống mặc định" + +#~ msgid "Use system &defaults" +#~ msgstr "Sử &dụng hệ thống mặc định" + #~ 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 " diff -Nru filezilla-3.14.1/locales/zh_CN.po filezilla-3.15.0.2/locales/zh_CN.po --- filezilla-3.14.1/locales/zh_CN.po 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/locales/zh_CN.po 2016-02-05 08:54:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: FileZilla 3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 11:13+0200\n" -"PO-Revision-Date: 2015-09-29 09:35+0800\n" +"POT-Creation-Date: 2016-01-13 13:13+0100\n" +"PO-Revision-Date: 2016-01-02 20:32+0800\n" "Last-Translator: Sun Junwen \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -47,9 +47,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" @@ -57,9 +57,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" @@ -77,12 +77,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:2778 #, c-format msgid "%d files added to queue" msgstr "%d 个文件已加入队列" -#: ../../locales/../src/engine/ControlSocket.cpp:104 +#: ../../locales/../src/engine/ControlSocket.cpp:105 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -122,12 +122,12 @@ #: ../../locales/../src/interface/verifycertdialog.cpp:46 #, c-format msgid "%s - Certificate expired!" -msgstr "%s - 证书已过期!" +msgstr "%s - 证书已过期！" #: ../../locales/../src/interface/verifycertdialog.cpp:32 #, c-format msgid "%s - Not yet valid!" -msgstr "%s - 尚未生效!" +msgstr "%s - 尚未生效！" #: ../../locales/../src/interface/resources/xrc/settings.xrc:532 #, c-format @@ -150,7 +150,7 @@ msgid_plural "%s bytes" msgstr[0] "%s 字节" -#: ../../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 " @@ -163,7 +163,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 " @@ -193,7 +193,7 @@ msgid "%w - Proxy password" msgstr "%w - 代理服务器密码" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3497 msgid "&Abort previous connection and connect in current tab" msgstr "放弃之前的连接并在当前标签中连接(&A)" @@ -246,7 +246,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)" @@ -284,9 +284,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 @@ -299,8 +299,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" @@ -373,14 +373,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)" @@ -388,12 +388,12 @@ msgid "&Directory comparison" msgstr "目录比较(&D)" -#: ../../locales/../src/interface/state.cpp:893 +#: ../../locales/../src/interface/state.cpp:887 msgid "" "&Disable synchronized browsing and continue changing the local directory" msgstr "停止同步浏览并且继续修改本地目录(&D)？" -#: ../../locales/../src/interface/state.cpp:966 +#: ../../locales/../src/interface/state.cpp:960 msgid "" "&Disable synchronized browsing and continue changing the remote directory" msgstr "停止同步浏览并且继续修改远程目录(&D)？" @@ -418,7 +418,7 @@ msgid "&Display size in bytes" msgstr "以字节为单位显示(&D)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3659 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3666 msgid "&Do not remember passwords (recommended)" msgstr "不要保存密码(推荐)(&D)" @@ -439,7 +439,7 @@ 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):" @@ -472,7 +472,7 @@ msgid "&Enable compression" 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)" @@ -489,7 +489,7 @@ msgid "&Enter custom command..." msgstr "输入自定义命令(&E)..." -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3483 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3490 msgid "&Establish connection in a new tab" msgstr "在新标签中建立连接(&E)" @@ -542,13 +542,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)" @@ -611,7 +611,7 @@ 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)" @@ -636,7 +636,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):" @@ -700,9 +700,9 @@ msgid "&New Site" msgstr "新站点(&N)" -#: ../../locales/../src/interface/Mainfrm.cpp:1663 +#: ../../locales/../src/interface/Mainfrm.cpp:1665 msgid "&New version available!" -msgstr "有新版了！(&N)" +msgstr "有新版本！(&N)" #: ../../locales/../src/interface/netconfwizard.cpp:27 msgid "&Next >" @@ -727,7 +727,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)" @@ -804,12 +804,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):" @@ -830,7 +830,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 @@ -891,7 +891,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)" @@ -960,7 +960,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)" @@ -972,7 +972,7 @@ msgid "&TLS Ciphers" msgstr "&TLS 密码" -#: ../../locales/../src/interface/netconfwizard.cpp:244 +#: ../../locales/../src/interface/netconfwizard.cpp:227 msgid "&Test" msgstr "测试(&T)" @@ -1015,7 +1015,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)" @@ -1049,7 +1049,7 @@ msgid "&Username:" msgstr "用户名(&U):" -#: ../../locales/../src/interface/Mainfrm.cpp:1657 +#: ../../locales/../src/interface/Mainfrm.cpp:1659 #, c-format msgid "&Version %s" msgstr "版本 %s (&V)" @@ -1093,12 +1093,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 "选定的协议不支持“帐号”登录类型" -#: ../../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." @@ -1110,7 +1110,7 @@ "changed to 'Ask for password'." msgstr "“正常”和“帐户”登录类型不可用。您的登录入口已更改为“询问密码”。" -#: ../../locales/../src/interface/Mainfrm.cpp:587 +#: ../../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 " @@ -1166,8 +1166,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 @@ -1245,7 +1245,7 @@ #: ../../locales/../src/interface/RemoteListView.cpp:157 #: ../../locales/../src/interface/RemoteTreeView.cpp:118 -#: ../../locales/../src/interface/state.cpp:742 +#: ../../locales/../src/interface/state.cpp:736 msgid "A directory cannot be dragged into one of its subdirectories." msgstr "目录无法被拖入其子目录中。" @@ -1271,7 +1271,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 " @@ -1288,7 +1288,7 @@ msgid "A new version of FileZilla is available:" msgstr "有新版的 FileZilla 可用:" -#: ../../locales/../src/interface/Mainfrm.cpp:647 +#: ../../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." @@ -1302,7 +1302,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?" @@ -1354,11 +1354,11 @@ #: ../../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: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" @@ -1384,13 +1384,13 @@ msgid "Active mode" msgstr "主动模式" -#: ../../locales/../src/interface/netconfwizard.cpp:621 +#: ../../locales/../src/interface/netconfwizard.cpp:614 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: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." @@ -1398,7 +1398,7 @@ "主动模式 FTP 测试失败。FileZilla 不知道正确的外部 IP 地址。除此之外，您的路由" "器已经修改了发送地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:596 +#: ../../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 " @@ -1411,7 +1411,7 @@ msgid "Active mode IP" msgstr "主动模式 IP" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3169 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3176 msgid "Add files to &queue only" msgstr "只添加文件到队列(&Q)" @@ -1430,7 +1430,7 @@ msgid "Add to queue" msgstr "添加到队列" -#: ../../locales/../src/engine/proxy.cpp:505 +#: ../../locales/../src/engine/proxy.cpp:528 msgid "Address type not supported" msgstr "不支持该地址类型" @@ -1450,7 +1450,7 @@ "开发版本。每日编译版的 FileZilla 可能工作不正常，甚至破坏您的系统。使用 Beta " "版和每日编译版的风险由您自己承担。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3500 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3507 msgid "Al&ways perform this action" msgstr "总是进行该操作(&W)" @@ -1458,7 +1458,7 @@ msgid "Algorithm:" msgstr "算法:" -#: ../../locales/../src/interface/QueueView.cpp:2950 +#: ../../locales/../src/interface/QueueView.cpp:2947 msgid "All files have been successfully transferred" msgstr "所有文件都已经成功传输" @@ -1466,7 +1466,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:2943 #, 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." @@ -1480,7 +1480,7 @@ 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 "已连接" @@ -1510,7 +1510,7 @@ "website:" msgstr "或者，从 FileZilla 网站下载最新的版本:" -#: ../../locales/../src/interface/QueueView.cpp:1911 +#: ../../locales/../src/interface/QueueView.cpp:1908 #, c-format msgid "" "An error occurred loading the transfer queue from \"%s\".\n" @@ -1519,7 +1519,7 @@ "在从“%s”加载传输队列时发生了一个错误。\n" "队列中的一些项可能没有恢复。" -#: ../../locales/../src/interface/QueueView.cpp:1821 +#: ../../locales/../src/interface/QueueView.cpp:1818 #, c-format msgid "" "An error occurred saving the transfer queue to \"%s\".\n" @@ -1528,23 +1528,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/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:937 msgid "" "Another remote operation is already in progress, cannot change directory now." msgstr "另一个远程操作正在进行，现在无法更改目录。" @@ -1553,11 +1553,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 "过滤器的任何更改都无法保存。" @@ -1581,7 +1581,7 @@ msgid "Archive" msgstr "归档" -#: ../../locales/../src/engine/socket.cpp:1095 +#: ../../locales/../src/engine/socket.cpp:1081 msgid "Argument buffer overflow" msgstr "参数缓冲区溢出" @@ -1599,7 +1599,7 @@ #: ../../locales/../src/engine/server.cpp:856 #: ../../locales/../src/engine/server.cpp:877 -#: ../../locales/../src/interface/manual_transfer.cpp:181 +#: ../../locales/../src/interface/manual_transfer.cpp:182 msgid "Ask for password" msgstr "询问密码" @@ -1611,7 +1611,7 @@ msgid "Ask your operating system for the external IP address" msgstr "向您的操作系统询问外部 IP 地址" -#: ../../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 论坛里提问" @@ -1631,7 +1631,7 @@ msgid "Attribute" msgstr "属性" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:672 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:657 msgid "Authentication failed." msgstr "认证失败。" @@ -1660,11 +1660,11 @@ msgid "B&ypass proxy" msgstr "绕过代理(&Y)" -#: ../../locales/../src/engine/socket.cpp:1059 +#: ../../locales/../src/engine/socket.cpp:1045 msgid "Bad file descriptor" msgstr "错误的文件描述符" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3366 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3373 msgid "Basic usage instructions" msgstr "基本使用说明" @@ -1677,7 +1677,7 @@ msgid "Being edited" msgstr "正在编辑" -#: ../../locales/../src/engine/tlssocket.cpp:1089 +#: ../../locales/../src/engine/tlssocket.cpp:1113 msgid "Beware! Certificate has been revoked" msgstr "注意！证书已被撤销" @@ -1695,11 +1695,11 @@ 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 "书签" @@ -1753,8 +1753,8 @@ msgid "CPU features:" msgstr "CPU 特性:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1570 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1226 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1571 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1211 msgid "Calculating timezone offset of server..." msgstr "计算服务器时差..." @@ -1786,13 +1786,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 "取消" @@ -1810,11 +1810,11 @@ msgid "Cannot access '%s', no media inserted or drive not ready." msgstr "无法访问“%s”，没有媒介插入或者驱动器未准备好。" -#: ../../locales/../src/interface/Mainfrm.cpp:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Cannot add server to Site Manager" msgstr "无法添加服务器到站点管理器" -#: ../../locales/../src/engine/socket.cpp:1112 +#: ../../locales/../src/engine/socket.cpp:1098 msgid "Cannot assign requested address" msgstr "无法分配请求的地址" @@ -1838,20 +1838,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:340 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:341 msgid "" "Cannot establish FTP connection to an SFTP server. Please select proper " "protocol." @@ -1866,11 +1866,11 @@ msgid "Cannot load key file" msgstr "无法加载密钥文件" -#: ../../locales/../src/interface/Mainfrm.cpp:993 +#: ../../locales/../src/interface/Mainfrm.cpp:994 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 "无法记住密码" @@ -1879,20 +1879,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:172 msgid "Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy." msgstr "无法将主机名解析为 IPv4 地址以用于 SOCKS4 代理。" -#: ../../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 "无法选择过滤器" @@ -1959,7 +1959,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 "字符编码问题" @@ -1987,19 +1987,19 @@ msgid "Check for updates failed" msgstr "检查更新失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:783 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:784 msgid "" "Check your login credentials. The entered password starts or ends with a " "space character." msgstr "请检查您的登录凭据。输入的密码开头或末尾有空格。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:779 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:780 msgid "" "Check your login credentials. The entered username starts or ends with a " "space character." msgstr "请检查您的登录凭据。输入的用户名开头或末尾有空格。" -#: ../../locales/../src/interface/netconfwizard.cpp:771 +#: ../../locales/../src/interface/netconfwizard.cpp:761 msgid "Checking for correct external IP address" msgstr "检查正确的外部 IP 地址" @@ -2007,12 +2007,12 @@ 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" @@ -2027,11 +2027,11 @@ #: ../../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 "块数据错误中止" @@ -2069,7 +2069,7 @@ msgid "Clear quickconnect bar" msgstr "清除快速连接栏" -#: ../../locales/../src/interface/netconfwizard.cpp:587 +#: ../../locales/../src/interface/netconfwizard.cpp:580 msgid "Click on Finish to save your configuration." msgstr "点击完成，保存您的配置。" @@ -2086,8 +2086,8 @@ msgstr "关闭所有其它的标签(&A)" #: ../../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:1135 +#: ../../locales/../src/interface/Mainfrm.cpp:1156 msgid "Close FileZilla" msgstr "关闭 FileZilla" @@ -2115,13 +2115,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:525 msgid "Command not supported" msgstr "不支持该命令" @@ -2129,7 +2129,7 @@ msgid "Command not supported by this protocol" msgstr "命令不被该协议支持" -#: ../../locales/../src/engine/logging.cpp:111 +#: ../../locales/../src/engine/logging.cpp:112 #: ../../locales/../src/interface/StatusView.cpp:283 #: ../../locales/../src/interface/StatusView.cpp:339 msgid "Command:" @@ -2143,8 +2143,8 @@ msgid "Common name:" msgstr "公用名:" -#: ../../locales/../src/interface/netconfwizard.cpp:442 -#: ../../locales/../src/interface/netconfwizard.cpp:457 +#: ../../locales/../src/interface/netconfwizard.cpp:439 +#: ../../locales/../src/interface/netconfwizard.cpp:452 msgid "Communication tainted by router or firewall" msgstr "通讯已受路由器或防火墙影响" @@ -2191,7 +2191,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)" @@ -2207,24 +2207,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:583 +#: ../../locales/../src/interface/netconfwizard.cpp:576 msgid "Congratulations, your configuration seems to be working." msgstr "祝贺您，您的配置看起来能正常运作。" @@ -2232,6 +2232,11 @@ msgid "Connect bypassing proxy settings" msgstr "绕过代理设置连接" +#: ../../locales/../src/interface/netconfwizard.cpp:216 +#, fuzzy, c-format +msgid "Connect failed: %s" +msgstr "代理请求失败: %s" + #: ../../locales/../src/interface/resources/xrc/settings.xrc:1383 msgid "Connect in current tab" msgstr "在当前标签中连接" @@ -2244,29 +2249,29 @@ msgid "Connect to specified Site Manager site" msgstr "连接至指定的“站点管理器”站点" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:908 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:909 msgid "Connected" msgstr "已连接" -#: ../../locales/../src/interface/queue.cpp:326 +#: ../../locales/../src/interface/queue.cpp:332 msgid "Connecting" msgstr "正在连接" -#: ../../locales/../src/interface/netconfwizard.cpp:223 +#: ../../locales/../src/interface/netconfwizard.cpp:210 #: ../../locales/../src/interface/statuslinectrl.cpp:243 #, 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:1051 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4261 #, 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:959 +#: ../../locales/../src/engine/proxy.cpp:266 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:355 #, c-format msgid "Connecting to %s..." msgstr "正在连接 %s..." @@ -2275,118 +2280,123 @@ msgid "Connection" msgstr "连接" -#: ../../locales/../src/engine/socket.cpp:1073 +#: ../../locales/../src/engine/socket.cpp:1059 msgid "Connection aborted" msgstr "连接中止" -#: ../../locales/../src/interface/queue.cpp:327 +#: ../../locales/../src/interface/queue.cpp:333 msgid "Connection attempt failed" msgstr "连接尝试失败" -#: ../../locales/../src/engine/ControlSocket.cpp:922 -#: ../../locales/../src/engine/proxy.cpp:217 +#: ../../locales/../src/engine/ControlSocket.cpp:923 +#: ../../locales/../src/engine/proxy.cpp:240 #, c-format msgid "Connection attempt failed with \"%s\", trying next address." msgstr "尝试连接“%s”失败，正在尝试下一个地址。" -#: ../../locales/../src/engine/ControlSocket.cpp:927 +#: ../../locales/../src/engine/ControlSocket.cpp:928 #, c-format msgid "Connection attempt failed with \"%s\"." msgstr "尝试连接“%s”失败。" -#: ../../locales/../src/engine/ControlSocket.cpp:184 +#: ../../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 +#: ../../locales/../src/engine/socket.cpp:1052 msgid "Connection attempt timed out" msgstr "连接尝试超时" -#: ../../locales/../src/interface/netconfwizard.cpp:559 +#: ../../locales/../src/interface/netconfwizard.cpp:552 msgid "Connection closed" msgstr "连接关闭" -#: ../../locales/../src/engine/ControlSocket.cpp:1017 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:219 +#: ../../locales/../src/engine/ControlSocket.cpp:1018 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:220 msgid "Connection closed by server" msgstr "连接被服务器关闭" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:384 -#: ../../locales/../src/engine/httpcontrolsocket.cpp:283 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:385 +#: ../../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:412 +#: ../../locales/../src/interface/netconfwizard.cpp:333 +#, fuzzy +msgid "Connection established, waiting for welcome message." +msgstr "连接建立，等待欢迎消息..." + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:413 msgid "Connection established, waiting for welcome message..." msgstr "连接建立，等待欢迎消息..." -#: ../../locales/../src/interface/netconfwizard.cpp:354 +#: ../../locales/../src/interface/netconfwizard.cpp:350 msgid "Connection lost" msgstr "连接丢失" -#: ../../locales/../src/engine/proxy.cpp:487 +#: ../../locales/../src/engine/proxy.cpp:510 msgid "Connection not allowed by ruleset" msgstr "规则设定不允许该连接" -#: ../../locales/../src/engine/proxy.cpp:496 +#: ../../locales/../src/engine/proxy.cpp:519 msgid "Connection refused" msgstr "连接被拒绝" -#: ../../locales/../src/engine/socket.cpp:1060 +#: ../../locales/../src/engine/socket.cpp:1046 msgid "Connection refused by server" msgstr "连接被服务器拒绝" -#: ../../locales/../src/engine/socket.cpp:1069 +#: ../../locales/../src/engine/socket.cpp:1055 msgid "Connection reset by network" msgstr "连接被网络复位" -#: ../../locales/../src/engine/socket.cpp:1074 +#: ../../locales/../src/engine/socket.cpp:1060 msgid "Connection reset by peer" msgstr "连接被对方复位" -#: ../../locales/../src/engine/ControlSocket.cpp:559 +#: ../../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] "%d 秒后无活动，连接超时" -#: ../../locales/../src/interface/netconfwizard.cpp:1077 +#: ../../locales/../src/interface/netconfwizard.cpp:1054 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:249 msgid "Connection with proxy established, performing handshake..." msgstr "与代理连接建立，进行握手..." -#: ../../locales/../src/interface/netconfwizard.cpp:577 +#: ../../locales/../src/interface/netconfwizard.cpp:570 msgid "Connection with server got closed prematurely." msgstr "服务器过早地关闭了连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:568 +#: ../../locales/../src/interface/netconfwizard.cpp:561 msgid "Connection with the test server failed." msgstr "测试服务器的连接失败。" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:106 +#: ../../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" @@ -2406,30 +2416,30 @@ msgid "Could not add connection to Site Manager" msgstr "无法添加当前连接到站点管理器" -#: ../../locales/../src/interface/state.cpp:757 +#: ../../locales/../src/interface/state.cpp:750 msgid "Could not complete operation" msgstr "完成操作" -#: ../../locales/../src/engine/ControlSocket.cpp:186 +#: ../../locales/../src/engine/ControlSocket.cpp:187 msgid "Could not connect to server" msgstr "无法连接到服务器" -#: ../../locales/../src/engine/ControlSocket.cpp:1087 +#: ../../locales/../src/engine/ControlSocket.cpp:1089 #, c-format msgid "Could not connect to server: %s" msgstr "无法连接到服务器: %s" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:803 +#: ../../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 "无法复制 URL" @@ -2437,17 +2447,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 "无法创建日志 mutex: %s" +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" @@ -2457,11 +2467,11 @@ "无法确定拖放操作的目标。\n" "这是由于 shell 扩展未正确安装，或者您没有把文件拖拽到文件浏览器窗口。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4095 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4110 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 " @@ -2472,41 +2482,46 @@ "您可以通过从命令行用“ --datadir <路径>”参数启动，或者设置 FZ_DATADIR 环境变量" "来设置 FileZilla的数据目录。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:680 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:681 msgid "Could not generate custom login sequence." msgstr "无法生成自定义登录过程。" -#: ../../locales/../src/engine/tlssocket.cpp:934 +#: ../../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:911 +#: ../../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:923 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:857 +#: ../../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:852 +#: ../../locales/../src/interface/FileZilla.cpp:108 +#, fuzzy, 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" @@ -2527,11 +2542,11 @@ 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:945 #, c-format msgid "" "Could not obtain corresponding local directory for the remote directory " @@ -2541,7 +2556,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 " @@ -2551,7 +2566,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 " @@ -2562,14 +2577,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" @@ -2582,7 +2597,12 @@ msgid "Could not parse server address:" msgstr "无法解析服务器地址:" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:210 +#: ../../locales/../src/interface/netconfwizard.cpp:977 +#, fuzzy +msgid "Could not read from data socket." +msgstr "无法读取套接字: %s" + +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:211 #, c-format msgid "Could not read from socket: %s" msgstr "无法读取套接字: %s" @@ -2591,29 +2611,34 @@ msgid "Could not read server item." msgstr "无法读取服务器项。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2595 +#: ../../locales/../src/interface/netconfwizard.cpp:344 +#, fuzzy +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/engine/ftpcontrolsocket.cpp:2502 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2503 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:2623 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2624 msgid "Could not spawn IO thread" msgstr "无法生成 IO 线程" -#: ../../locales/../src/engine/ControlSocket.cpp:1064 +#: ../../locales/../src/engine/ControlSocket.cpp:1065 #, c-format msgid "Could not start proxy handshake: %s" msgstr "无法开始代理握手: %s" -#: ../../locales/../src/interface/queue.cpp:332 +#: ../../locales/../src/interface/queue.cpp:338 msgid "Could not start transfer" msgstr "无法启动传输" @@ -2635,7 +2660,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:1847 #, c-format msgid "" "Could not write \"%s\", the queue could not be saved.\n" @@ -2646,7 +2671,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:720 #: ../../locales/../src/interface/sitemanager.cpp:774 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2223 +#: ../../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" @@ -2656,23 +2681,23 @@ msgid "Could not write \"%s\":" msgstr "无法写入“%s”:" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:148 +#: ../../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:882 -#: ../../locales/../src/engine/ControlSocket.cpp:986 +#: ../../locales/../src/engine/ControlSocket.cpp:883 +#: ../../locales/../src/engine/ControlSocket.cpp:987 #, c-format msgid "Could not write to socket: %s" msgstr "无法写入套接字: %s" @@ -2685,11 +2710,11 @@ msgid "Crea&te new file" msgstr "创建新文件(&T)" -#: ../../locales/../src/interface/state.cpp:965 +#: ../../locales/../src/interface/state.cpp:959 msgid "Create &missing local directory and enter it" msgstr "创建缺失的本地目录并进入该目录(&M)" -#: ../../locales/../src/interface/state.cpp:892 +#: ../../locales/../src/interface/state.cpp:886 msgid "Create &missing remote directory and enter it" msgstr "创建缺失的远程目录并进入该目录(&M)" @@ -2718,45 +2743,45 @@ msgid "Create director&y and enter it" 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:3170 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1951 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3171 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1932 #, c-format msgid "Creating directory '%s'..." msgstr "正在创建目录“%s”..." -#: ../../locales/../src/engine/ControlSocket.cpp:179 +#: ../../locales/../src/engine/ControlSocket.cpp:180 msgid "Critical error" msgstr "严重错误" -#: ../../locales/../src/engine/ControlSocket.cpp:170 +#: ../../locales/../src/engine/ControlSocket.cpp:171 msgid "Critical error:" msgstr "严重错误:" -#: ../../locales/../src/engine/ControlSocket.cpp:134 +#: ../../locales/../src/engine/ControlSocket.cpp:135 msgid "Critical file transfer error" msgstr "严重文件传输错误" -#: ../../locales/../src/engine/ControlSocket.cpp:119 +#: ../../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" @@ -2786,7 +2811,7 @@ msgid "Cus&tom" msgstr "自定义(&T)" -#: ../../locales/../src/interface/filter.cpp:100 +#: ../../locales/../src/interface/filter.cpp:101 msgid "Custom filter set" msgstr "自定义过滤器集合" @@ -2813,6 +2838,10 @@ msgid "D&elete" msgstr "删除(&E)" +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:2704 +msgid "D&irectory comparison" +msgstr "目录比较(&D)" + #: ../../locales/../src/interface/resources/xrc/dialogs.xrc:1100 msgid "D&isable all" msgstr "全部禁用(&I)" @@ -2826,7 +2855,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)" @@ -2842,8 +2871,8 @@ msgid "Data" msgstr "数据" -#: ../../locales/../src/interface/netconfwizard.cpp:994 -#: ../../locales/../src/interface/netconfwizard.cpp:1058 +#: ../../locales/../src/interface/netconfwizard.cpp:971 +#: ../../locales/../src/interface/netconfwizard.cpp:1036 msgid "Data socket closed too early." msgstr "数据套接字过早关闭。" @@ -2956,19 +2985,11 @@ msgid "Deleting %u files from \"%s\"" msgstr "正在从“%2$s”删除 %1$u 个文件" -#: ../../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: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 "桌面" @@ -2990,7 +3011,7 @@ msgid "Dire&ctories" msgstr "目录(&C)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Direction" msgstr "方向" @@ -2998,13 +3019,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:2165 +#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/Mainfrm.cpp:2167 msgid "Directory comparison" msgstr "比较目录" @@ -3016,11 +3037,11 @@ msgid "Directory containing the logfile does not exist or filename is invalid." msgstr "保存日志文件的目录不存在或文件名无效。" -#: ../../locales/../src/engine/ControlSocket.cpp:190 +#: ../../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 "目录列表失败" @@ -3028,12 +3049,12 @@ 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:195 +#: ../../locales/../src/engine/ControlSocket.cpp:196 msgid "Directory listing successful" msgstr "列出目录成功" @@ -3041,12 +3062,12 @@ msgid "Disa&ble all" msgstr "全部禁用(&B)" -#: ../../locales/../src/interface/state.cpp:958 +#: ../../locales/../src/interface/state.cpp:952 msgid "" "Disable synchronized browsing and continue changing the remote directory?" msgstr "关闭同步浏览并且继续修改本地目录？" -#: ../../locales/../src/interface/Mainfrm.cpp:649 +#: ../../locales/../src/interface/Mainfrm.cpp:650 msgid "" "Disable this option again if you will not be able to see the correct " "directory contents anymore." @@ -3056,23 +3077,23 @@ 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: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 "已从服务器断开" -#: ../../locales/../src/engine/ControlSocket.cpp:1019 -#: ../../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 "正在从上一个服务器断开连接" @@ -3098,8 +3119,8 @@ msgid "Do the same with &all selected files already being edited" msgstr "对所有正在编辑的选中文件执行相同操作(&A):" -#: ../../locales/../src/interface/Mainfrm.cpp:1137 -#: ../../locales/../src/interface/Mainfrm.cpp:1159 +#: ../../locales/../src/interface/Mainfrm.cpp:1138 +#: ../../locales/../src/interface/Mainfrm.cpp:1160 msgid "Do you really want to close FileZilla?" msgstr "您真的要关闭 FileZilla？" @@ -3120,7 +3141,7 @@ msgid "Do you really want to delete the transfer queue?" msgstr "您真的想删除传输队列？" -#: ../../locales/../src/interface/Mainfrm.cpp:588 +#: ../../locales/../src/interface/Mainfrm.cpp:589 #, c-format msgid "Do you really want to send '%s' to the server?" msgstr "您真的想发送“%s”给服务器吗?" @@ -3129,7 +3150,7 @@ msgid "Do you want to reopen this file?" msgstr "您真的要重新打开这个文件吗？" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3354 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3361 msgid "Documentation" msgstr "文档" @@ -3149,7 +3170,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):" @@ -3163,9 +3184,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 "下载搜索结果" @@ -3177,7 +3198,7 @@ msgid "Download selected files and directories" msgstr "下载选定的文件和目录" -#: ../../locales/../src/interface/Mainfrm.cpp:965 +#: ../../locales/../src/interface/Mainfrm.cpp:966 #, c-format msgid "" "Download speed: %s/s\n" @@ -3190,26 +3211,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:88 #: ../../locales/../src/interface/RemoteListView.cpp:102 #: ../../locales/../src/interface/RemoteTreeView.cpp:89 msgid "" @@ -3217,9 +3230,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:101 #: ../../locales/../src/interface/RemoteListView.cpp:108 #: ../../locales/../src/interface/RemoteTreeView.cpp:95 msgid "Drag&drop between different servers has not been implemented yet." @@ -3269,16 +3282,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:684 msgid "Editing directories is not supported" 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 +#: ../../locales/../src/interface/search.cpp:684 msgid "Editing search results" msgstr "编辑搜索结果" @@ -3286,7 +3299,7 @@ msgid "Email:" msgstr "电子邮件:" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "Empty command" msgstr "空命令" @@ -3294,7 +3307,7 @@ msgid "Empty command." msgstr "空命令。" -#: ../../locales/../src/interface/RemoteListView.cpp:2025 +#: ../../locales/../src/interface/RemoteListView.cpp:2015 msgid "Empty directory listing" msgstr "空目录列表" @@ -3302,6 +3315,12 @@ 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 "空文件扩展名。" @@ -3340,7 +3359,7 @@ msgid "Encryption details" msgstr "加密细节" -#: ../../locales/../src/interface/filelistctrl.cpp:465 +#: ../../locales/../src/interface/filelistctrl.cpp:467 msgid "End comparison and change sorting order?" msgstr "结束对比并改变排序？" @@ -3348,15 +3367,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:2109 msgid "Enter command" msgstr "输入命令" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "Enter custom command" msgstr "输入自定义命令" @@ -3370,11 +3389,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 "输入过滤器集合新名称" @@ -3414,7 +3433,7 @@ "- ftps:// FTP over TLS (隐式)\n" "- ftpes:// FTP over TLS (显式)" -#: ../../locales/../src/interface/fzputtygen_interface.cpp:110 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:109 #, c-format msgid "" "Enter the password for the file '%s'.\n" @@ -3444,7 +3463,7 @@ msgid "Error importing" msgstr "导入出错" -#: ../../locales/../src/interface/QueueView.cpp:1912 +#: ../../locales/../src/interface/QueueView.cpp:1909 msgid "Error loading queue" msgstr "加载队列出错" @@ -3453,14 +3472,14 @@ #: ../../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/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 @@ -3469,32 +3488,32 @@ #: ../../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:939 msgid "Error loading xml file" msgstr "导入 XML 文件出错" -#: ../../locales/../src/interface/QueueView.cpp:1822 +#: ../../locales/../src/interface/QueueView.cpp:1819 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/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: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/engine/logging.cpp:111 #: ../../locales/../src/interface/StatusView.cpp:281 #: ../../locales/../src/interface/StatusView.cpp:335 msgid "Error:" @@ -3584,24 +3603,24 @@ msgid "FTPS - FTP over implicit TLS" 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 "无法复制或移动站点" @@ -3609,28 +3628,28 @@ msgid "Failed to create backup copy of xml file" msgstr "创建 XML 文件的备件副本失败" -#: ../../locales/../src/interface/netconfwizard.cpp:803 +#: ../../locales/../src/interface/netconfwizard.cpp:792 msgid "Failed to create listen socket, aborting" msgstr "创建监听套接字失败，正在中止" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4074 -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4078 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4089 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4093 msgid "Failed to create listening socket for active mode transfer" msgstr "为主动模式传输创建监听套接字失败" -#: ../../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:961 +#: ../../locales/../src/interface/netconfwizard.cpp:944 msgid "Failed to get peer address of control connection, connection closed." msgstr "无法获取控制连接的对等地址，连接已关闭。" -#: ../../locales/../src/interface/netconfwizard.cpp:968 +#: ../../locales/../src/interface/netconfwizard.cpp:951 msgid "Failed to get peer address of data connection, connection closed." msgstr "无法获取数据连接的对等地址，连接已关闭。" @@ -3638,101 +3657,106 @@ 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/ftpcontrolsocket.cpp:393 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:755 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:292 msgid "Failed to initialize TLS." msgstr "TLS 初始化失败。" +#: ../../locales/../src/interface/FileZilla.cpp:109 +#, fuzzy +msgid "Failed to initialize networking" +msgstr "FTP 引擎初始化失败" + #: ../../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:2492 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2493 #, c-format msgid "Failed to open \"%s\" for appending/writing" msgstr "打开“%s”追加/写入失败" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2558 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2559 #, 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/ftpcontrolsocket.cpp:2525 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:1008 #, c-format msgid "Failed to open \"%s\" for writing" msgstr "打开“%s”写入失败" -#: ../../locales/../src/engine/ControlSocket.cpp:346 +#: ../../locales/../src/engine/ControlSocket.cpp:347 msgid "Failed to parse returned path." msgstr "无法解析返回的路径。" -#: ../../locales/../src/interface/netconfwizard.cpp:1023 +#: ../../locales/../src/interface/netconfwizard.cpp:1003 msgid "Failed to receive data" msgstr "接收数据失败" -#: ../../locales/../src/engine/ControlSocket.cpp:192 +#: ../../locales/../src/engine/ControlSocket.cpp:193 msgid "Failed to retrieve directory listing" msgstr "读取目录列表失败" -#: ../../locales/../src/interface/netconfwizard.cpp:731 +#: ../../locales/../src/interface/netconfwizard.cpp:721 msgid "Failed to retrieve external ip address, aborting" msgstr "无法获取外部 IP 地址，中止" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3785 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3786 msgid "Failed to retrieve external ip address, using local address" msgstr "无法获取外部 IP 地址，使用本地地址。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3806 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3807 msgid "Failed to retrieve local ip address." msgstr "无法获取本地 IP 地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:707 +#: ../../locales/../src/interface/netconfwizard.cpp:697 msgid "Failed to retrieve local ip address. Aborting" msgstr "无法获取本地 IP 地址。中止" -#: ../../locales/../src/interface/netconfwizard.cpp:632 +#: ../../locales/../src/interface/netconfwizard.cpp:625 msgid "Failed to retrieve the external IP address." msgstr "无法获取外部 IP 地址。" -#: ../../locales/../src/interface/netconfwizard.cpp:323 +#: ../../locales/../src/interface/netconfwizard.cpp:313 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，将使用系统默认语言。" @@ -3741,11 +3765,11 @@ msgid "Failed to validate settings" msgstr "校验设置失败" -#: ../../locales/../src/engine/tlssocket.cpp:1083 +#: ../../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 文件失败" @@ -3778,7 +3802,7 @@ msgid "File Types" msgstr "文件类型" -#: ../../locales/../src/engine/socket.cpp:1065 +#: ../../locales/../src/engine/socket.cpp:1051 msgid "File descriptor not a socket" msgstr "文件描述符不是套接字" @@ -3790,7 +3814,7 @@ msgid "File editing" msgstr "文件编辑" -#: ../../locales/../src/interface/RemoteListView.cpp:1603 +#: ../../locales/../src/interface/RemoteListView.cpp:1596 msgid "File exists" msgstr "文件已存在" @@ -3807,8 +3831,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 "文件未找到" @@ -3817,38 +3841,38 @@ msgid "File search" msgstr "文件搜索" -#: ../../locales/../src/engine/ControlSocket.cpp:126 +#: ../../locales/../src/engine/ControlSocket.cpp:127 msgid "File transfer aborted by user" msgstr "传输被用户终止" -#: ../../locales/../src/engine/ControlSocket.cpp:117 +#: ../../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:136 +#: ../../locales/../src/engine/ControlSocket.cpp:137 msgid "File transfer failed" msgstr "文件传输失败" -#: ../../locales/../src/engine/ControlSocket.cpp:121 +#: ../../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:131 +#: ../../locales/../src/engine/ControlSocket.cpp:132 msgid "File transfer skipped" msgstr "文件传输被跳过" -#: ../../locales/../src/engine/ControlSocket.cpp:129 +#: ../../locales/../src/engine/ControlSocket.cpp:130 msgid "File transfer successful" msgstr "文件传输成功" -#: ../../locales/../src/engine/ControlSocket.cpp:114 +#: ../../locales/../src/engine/ControlSocket.cpp:115 #, c-format msgid "File transfer successful, transferred %s in %s" msgstr "文件传输成功，传输了 %s (用时%s)" -#: ../../locales/../src/interface/Mainfrm.cpp:1136 +#: ../../locales/../src/interface/Mainfrm.cpp:1137 msgid "File transfers still in progress." msgstr "文件传输仍在进行。" @@ -3860,7 +3884,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" @@ -3872,11 +3896,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:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 msgid "FileZilla needs to be restarted for the language change to take effect." msgstr "改变语言需要重启 FileZilla 才会生效。" @@ -3890,7 +3914,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 @@ -3901,13 +3925,13 @@ msgid "Filename &filters..." msgstr "文件名过滤器(&F)..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2974 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2193 +#: ../../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 "无法为目录 %s 和文件名 %s 构造文件名" -#: ../../locales/../src/interface/RemoteListView.cpp:1589 +#: ../../locales/../src/interface/RemoteListView.cpp:1582 msgid "Filename invalid" msgstr "文件名无效" @@ -3935,7 +3959,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" @@ -3945,7 +3969,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" @@ -3983,8 +4007,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 "过滤器集合已经存在" @@ -3998,11 +4022,11 @@ msgid "Filter validation failed" msgstr "过滤器核对失败" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3061 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3068 msgid "Find &files" msgstr "查找文件(&F)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3066 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3073 msgid "Find d&irectories" msgstr "查找目录(&I)" @@ -4019,7 +4043,7 @@ msgid "Fingerprint:" msgstr "指纹:" -#: ../../locales/../src/interface/netconfwizard.cpp:58 +#: ../../locales/../src/interface/netconfwizard.cpp:55 msgid "Firewall and router configuration wizard" msgstr "防火墙和路由器配置向导" @@ -4047,7 +4071,7 @@ msgid "Force showing &hidden files" msgstr "强制显示隐藏文件(&H)" -#: ../../locales/../src/interface/Mainfrm.cpp:644 +#: ../../locales/../src/interface/Mainfrm.cpp:645 msgid "Force showing hidden files" msgstr "强制显示隐藏文件" @@ -4060,12 +4084,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 "发现了新的 %s %s\n" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3378 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3385 msgid "Further documentation" msgstr "更多文档" @@ -4073,7 +4097,7 @@ msgid "General" msgstr "常规" -#: ../../locales/../src/engine/proxy.cpp:484 +#: ../../locales/../src/engine/proxy.cpp:507 msgid "General SOCKS server failure" msgstr "常规 SOCKS 服务器故障" @@ -4086,12 +4110,12 @@ msgid "Get external IP address from the following URL:" msgstr "从以下 URL 得到外部 IP 地址:" -#: ../../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 "给定的过滤器集合名已经存在，是否覆盖过滤器集合？" @@ -4099,22 +4123,22 @@ msgid "Global bookmarks" msgstr "全局书签" -#: ../../locales/../src/engine/tlssocket.cpp:188 +#: ../../locales/../src/engine/tlssocket.cpp:212 #, c-format msgid "GnuTLS error %d" msgstr "GnuTLS 错误 %d" -#: ../../locales/../src/engine/tlssocket.cpp:190 +#: ../../locales/../src/engine/tlssocket.cpp:214 #, c-format msgid "GnuTLS error %d in %s" msgstr "GnuTLS 错误 %d，位于 %s" -#: ../../locales/../src/engine/tlssocket.cpp:184 +#: ../../locales/../src/engine/tlssocket.cpp:208 #, c-format msgid "GnuTLS error %d in %s: %s" msgstr "GnuTLS 错误 %d，位于 %s: %s" -#: ../../locales/../src/engine/tlssocket.cpp:182 +#: ../../locales/../src/engine/tlssocket.cpp:206 #, c-format msgid "GnuTLS error %d: %s" msgstr "GnuTLS 错误 %d: %s" @@ -4144,17 +4168,17 @@ 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:911 +#: ../../locales/../src/interface/queue.cpp:998 msgid "High" msgstr "高" -#: ../../locales/../src/interface/queue.cpp:907 -#: ../../locales/../src/interface/queue.cpp:994 +#: ../../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 之间。" @@ -4167,7 +4191,7 @@ msgid "Homepage:" msgstr "主页:" -#: ../../locales/../src/engine/socket.cpp:1076 +#: ../../locales/../src/engine/socket.cpp:1062 msgid "Host is down" msgstr "主机已关闭" @@ -4183,7 +4207,7 @@ msgid "Host starts with '[' but no closing bracket found." msgstr "主机名以“[”开始，但没有结束符“]”。" -#: ../../locales/../src/engine/proxy.cpp:493 +#: ../../locales/../src/engine/proxy.cpp:516 msgid "Host unreachable" msgstr "无法连接主机" @@ -4202,7 +4226,7 @@ msgid "I&SO 8601 (example: 15:47)" msgstr "I&SO 8601 (示例: 15:47)" -#: ../../locales/../src/engine/proxy.cpp:141 +#: ../../locales/../src/engine/proxy.cpp:153 msgid "IPv6 addresses are not supported with SOCKS4 proxy" msgstr "SOCKS4 代理不支持 IPv6 地址" @@ -4242,13 +4266,13 @@ "administrator." msgstr "如果主机密钥的更换有异，请联系服务器管理员。" -#: ../../locales/../src/interface/netconfwizard.cpp:570 +#: ../../locales/../src/interface/netconfwizard.cpp:563 msgid "" "If the problem persists, some router and/or firewall keeps blocking " "FileZilla." msgstr "如果这个问题仍然存在，则是某些路由器和/或防火墙一直在阻止 FileZilla。" -#: ../../locales/../src/interface/netconfwizard.cpp:579 +#: ../../locales/../src/interface/netconfwizard.cpp:572 msgid "" "If the problem persists, some router and/or firewall keeps interrupting the " "connection." @@ -4263,7 +4287,7 @@ "如果日志文件的体积达到限制，它将以文件名末尾将加上“.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." @@ -4271,13 +4295,13 @@ "如果符号链接指向一个目录，FileZilla 可以删除符号链接或者删除所指向的目录内" "容。" -#: ../../locales/../src/interface/netconfwizard.cpp:640 +#: ../../locales/../src/interface/netconfwizard.cpp:633 msgid "" "If this problem persists, please contact your router or firewall " "manufacturer for a solution." msgstr "如果这个问题仍然存在，请联系您的路由器或防火墙的制造商。" -#: ../../locales/../src/interface/netconfwizard.cpp:598 +#: ../../locales/../src/interface/netconfwizard.cpp:591 msgid "If this problem stays, please contact your router manufacturer." msgstr "如果这个问题仍然存在，请联系您的路由器制造商。" @@ -4309,7 +4333,7 @@ "如果您点击了测试，FileZilla 会连接到 probe.filezilla-project.org 并且进行一些" "简单测试。" -#: ../../locales/../src/interface/Mainfrm.cpp:1158 +#: ../../locales/../src/interface/Mainfrm.cpp:1159 msgid "If you close FileZilla, your changes will be lost." msgstr "如果关闭 FileZilla，您所做的改变将会丢失。" @@ -4329,7 +4353,7 @@ "try to change the default transfer mode." msgstr "如果您在取得目录列表或传输文件的时候碰到问题，请试着改变默认传输模式。" -#: ../../locales/../src/interface/netconfwizard.cpp:585 +#: ../../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 " @@ -4359,7 +4383,7 @@ msgstr "" "如果您使用了路由器，确保所有的端口都已被转发到您运行 FileZilla 的机器上。" -#: ../../locales/../src/interface/netconfwizard.cpp:611 +#: ../../locales/../src/interface/netconfwizard.cpp:604 msgid "" "If your router keeps changing the IP address, please contact your router " "manufacturer." @@ -4415,13 +4439,13 @@ "在被动模式下(推荐大多数用户使用)，FileZilla 请求服务器给出一个端口，然后连接" "到那个端口去。不需要太多的配置。" -#: ../../locales/../src/engine/tlssocket.cpp:1095 +#: ../../locales/../src/engine/tlssocket.cpp:1119 msgid "" "Incomplete chain, top certificate is not self-signed certificate authority " "certificate" msgstr "不完整的认证链，顶级证书不是自签发证书授权证书" -#: ../../locales/../src/interface/queue.cpp:322 +#: ../../locales/../src/interface/queue.cpp:328 msgid "Incorrect password" msgstr "密码错误" @@ -4431,22 +4455,21 @@ "Please try again later." msgstr "无法获取最新版本 FileZilla 的信息。请稍后重试。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:745 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:746 msgid "Initializing TLS..." msgstr "初始化 TLS 中..." #: ../../locales/../src/interface/verifycertdialog.cpp:107 -#, fuzzy msgid "Insecure algorithm!" -msgstr "签名算法:" +msgstr "不安全的算法！" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:729 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:730 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:184 +#: ../../locales/../src/interface/manual_transfer.cpp:185 msgid "Interactive" msgstr "交互式" @@ -4454,41 +4477,42 @@ msgid "Interface" msgstr "界面" -#: ../../locales/../src/engine/socket.cpp:1062 +#: ../../locales/../src/engine/socket.cpp:1048 msgid "Interrupted by signal" msgstr "被信号量中断" -#: ../../locales/../src/engine/ControlSocket.cpp:219 -#: ../../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 +#: ../../locales/../src/engine/socket.cpp:1036 msgid "Invalid argument passed" msgstr "传递了无效参数" -#: ../../locales/../src/engine/ControlSocket.cpp:455 -#: ../../locales/../src/engine/ControlSocket.cpp:511 +#: ../../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 "收到无效字节，将禁用 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:369 -#: ../../locales/../src/interface/netconfwizard.cpp:379 -#: ../../locales/../src/interface/netconfwizard.cpp:388 +#: ../../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 "收到无效数据" @@ -4531,20 +4555,20 @@ "ftps:// 通过 TLS 传输的 FTP (隐式)以及\n" "ftpes:// 通过 TLS 传输的 FTP (显式)。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233 msgid "" "Invalid proxy host, after closing bracket only colon and port may follow." msgstr "无效代理主机名，在闭合括号之后只允许是跟冒号加端口号。" -#: ../../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" @@ -4572,11 +4596,11 @@ msgid "Invalid username given." msgstr "无效的用户名。" -#: ../../locales/../src/engine/socket.cpp:1083 +#: ../../locales/../src/engine/socket.cpp:1069 msgid "Invalid value for ai_flags" msgstr "ai_flags 的值无效" -#: ../../locales/../src/engine/socket.cpp:1085 +#: ../../locales/../src/engine/socket.cpp:1071 msgid "Invalid value for hints" msgstr "提示的值无效" @@ -4596,7 +4620,7 @@ msgid "Keep directories on top" msgstr "保持目录在上方" -#: ../../locales/../src/interface/Mainfrm.cpp:648 +#: ../../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 " @@ -4630,11 +4654,11 @@ msgid "Language" msgstr "语言" -#: ../../locales/../src/interface/Mainfrm.cpp:1440 +#: ../../locales/../src/interface/Mainfrm.cpp:1442 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" @@ -4664,7 +4688,7 @@ msgid "Limit:" msgstr "限制:" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:793 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:796 msgid "Line length exceeded" msgstr "行长度已超出" @@ -4672,11 +4696,12 @@ msgid "Linked against" msgstr "链接库" -#: ../../locales/../src/interface/netconfwizard.cpp:283 +#: ../../locales/../src/interface/netconfwizard.cpp:264 +#: ../../locales/../src/interface/netconfwizard.cpp:270 msgid "Listen socket closed" msgstr "监听套接字已关闭" -#: ../../locales/../src/engine/logging.cpp:117 +#: ../../locales/../src/engine/logging.cpp:118 #: ../../locales/../src/interface/StatusView.cpp:292 #: ../../locales/../src/interface/StatusView.cpp:363 msgid "Listing:" @@ -4691,11 +4716,11 @@ msgid "Local" msgstr "本地" -#: ../../locales/../src/engine/socket.cpp:1047 +#: ../../locales/../src/engine/socket.cpp:1033 msgid "Local address in use" msgstr "本地地址正在使用中" -#: ../../locales/../src/engine/socket.cpp:1075 +#: ../../locales/../src/engine/socket.cpp:1061 msgid "Local endpoint has been closed" msgstr "本地端点 (endpoint) 已关闭" @@ -4703,21 +4728,21 @@ 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 "本地文件不是一个有效的文件名。" @@ -4742,7 +4767,7 @@ msgid "Logging" msgstr "日志" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803 +#: ../../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." @@ -4750,14 +4775,14 @@ "登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。所以无法退回使用本地编" "码。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810 +#: ../../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 "" "登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。尝试使用本地编码。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:837 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:838 msgid "Login sequence fully executed yet not logged in. Aborting." msgstr "登录过程已完全执行，但依然无法登录。正在终止。" @@ -4772,17 +4797,17 @@ "'%s' or '%s'" msgstr "登录类型只能和 FTP URL 一起使用。参数必须是“%s”或“%s”" -#: ../../locales/../src/interface/queue.cpp:900 -#: ../../locales/../src/interface/queue.cpp:987 +#: ../../locales/../src/interface/queue.cpp:906 +#: ../../locales/../src/interface/queue.cpp:993 msgid "Low" msgstr "低" -#: ../../locales/../src/interface/queue.cpp:898 -#: ../../locales/../src/interface/queue.cpp:985 +#: ../../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 之间。" @@ -4794,44 +4819,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 "不匹配以下内容" @@ -4839,12 +4864,12 @@ msgid "Maximum simultaneous &transfers:" msgstr "最大并发传输(&T):" -#: ../../locales/../src/engine/socket.cpp:1089 +#: ../../locales/../src/engine/socket.cpp:1075 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:1752 msgid "Message log" msgstr "消息日志" @@ -4852,7 +4877,7 @@ msgid "Message log position" msgstr "消息日志位置" -#: ../../locales/../src/engine/socket.cpp:1072 +#: ../../locales/../src/engine/socket.cpp:1058 msgid "Message too large" msgstr "消息过长" @@ -4872,11 +4897,11 @@ 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 "我的文档" @@ -4917,7 +4942,7 @@ 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 "需要输入正确的远程路径" @@ -4925,18 +4950,18 @@ msgid "Need to specify a character encoding" msgstr "需要指定字符编码" -#: ../../locales/../src/engine/socket.cpp:1093 +#: ../../locales/../src/engine/socket.cpp:1079 msgid "Neither nodename nor servname provided, or not known" msgstr "未提供，或不知道节点名或服务名" -#: ../../locales/../src/engine/socket.cpp:1080 +#: ../../locales/../src/engine/socket.cpp:1066 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:513 +#: ../../locales/../src/engine/socket.cpp:1050 msgid "Network unreachable" msgstr "无法连接网络" @@ -4952,7 +4977,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)" @@ -4972,13 +4997,13 @@ #: ../../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/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 "创建目录" @@ -4997,7 +5022,7 @@ #: ../../locales/../src/interface/sitemanager.cpp:585 #: ../../locales/../src/interface/sitemanager.cpp:597 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:2156 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:2159 msgid "New site" msgstr "新站点" @@ -5005,11 +5030,11 @@ msgid "Next to the transfer queue" msgstr "在传输队列旁边" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:850 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:835 msgid "No" msgstr "否" -#: ../../locales/../src/engine/socket.cpp:1091 +#: ../../locales/../src/engine/socket.cpp:1077 msgid "No address associated with nodename" msgstr "节点名称没有关联地址" @@ -5017,11 +5042,11 @@ msgid "No category to export selected" msgstr "没有选定要导出的分类目录" -#: ../../locales/../src/interface/QueueView.cpp:2123 +#: ../../locales/../src/interface/QueueView.cpp:2120 msgid "No command given, aborting." msgstr "没有给出命令，中止。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3757 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3758 msgid "No external IP address set, trying default." msgstr "没有设定外部 IP 地址，尝试使用默认值。" @@ -5043,25 +5068,25 @@ msgid "No images available" msgstr "没有图像可用" -#: ../../locales/../src/interface/QueueView.cpp:2977 +#: ../../locales/../src/interface/QueueView.cpp:2974 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:1053 msgid "No route to host" msgstr "无法连通主机" @@ -5073,7 +5098,7 @@ msgid "No sites available" msgstr "没有站点可用" -#: ../../locales/../src/engine/proxy.cpp:461 +#: ../../locales/../src/engine/proxy.cpp:484 msgid "No supported SOCKS5 auth method" msgstr "不支持 SOCKS5 认证方式" @@ -5091,18 +5116,18 @@ msgid "None selected yet" msgstr "尚未选择项目" -#: ../../locales/../src/engine/socket.cpp:1087 +#: ../../locales/../src/engine/socket.cpp:1073 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/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 "正常" @@ -5112,16 +5137,16 @@ 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: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:560 +#: ../../locales/../src/interface/Mainfrm.cpp:561 msgid "Not connected to any server." msgstr "没有连接到任何服务器。" @@ -5129,11 +5154,11 @@ msgid "Not connected." msgstr "未连接。" -#: ../../locales/../src/engine/socket.cpp:1108 +#: ../../locales/../src/engine/socket.cpp:1094 msgid "Not initialized, need to call WSAStartup" msgstr "尚未初始化，需要调用 WSAStartup" -#: ../../locales/../src/interface/Mainfrm.cpp:646 +#: ../../locales/../src/interface/Mainfrm.cpp:647 msgid "Note that this feature is only supported using the FTP protocol." msgstr "注意这个功能只支持使用 FTP 协议。" @@ -5174,13 +5199,13 @@ #: ../../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" @@ -5196,7 +5221,7 @@ "well as the fallback mode if enabled." msgstr "在接下来的几个页面里将要设置选择的传输模式以及退回模式(如果启用)。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:860 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:845 msgid "Once" msgstr "一次" @@ -5242,8 +5267,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 "打开失败" @@ -5264,15 +5289,15 @@ msgid "Operating System:" msgstr "操作系统:" -#: ../../locales/../src/engine/socket.cpp:1058 +#: ../../locales/../src/engine/socket.cpp:1044 msgid "Operation already in progress" msgstr "操作已经在进行" -#: ../../locales/../src/engine/socket.cpp:1049 +#: ../../locales/../src/engine/socket.cpp:1035 msgid "Operation in progress" msgstr "操作正在进行" -#: ../../locales/../src/engine/socket.cpp:1070 +#: ../../locales/../src/engine/socket.cpp:1056 msgid "Operation not supported" msgstr "不支持该操作" @@ -5284,7 +5309,7 @@ msgid "Other SFTP options" msgstr "其他 SFTP 选项" -#: ../../locales/../src/engine/socket.cpp:1103 +#: ../../locales/../src/engine/socket.cpp:1089 msgid "Other system error" msgstr "其他系统错误" @@ -5292,8 +5317,8 @@ msgid "Other:" msgstr "其他:" -#: ../../locales/../src/engine/socket.cpp:1053 -#: ../../locales/../src/engine/socket.cpp:1054 +#: ../../locales/../src/engine/socket.cpp:1039 +#: ../../locales/../src/engine/socket.cpp:1040 msgid "Out of memory" msgstr "内存不足" @@ -5341,7 +5366,7 @@ 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 "自己的构建类型: %s\n" @@ -5366,7 +5391,7 @@ msgid "P&roxy host:" msgstr "代理主机(&R):" -#: ../../locales/../src/interface/netconfwizard.cpp:504 +#: ../../locales/../src/interface/netconfwizard.cpp:497 msgid "PORT command tainted by router or firewall." msgstr "PORT 命令已受路由器或防火墙影响。" @@ -5374,11 +5399,11 @@ msgid "Pa&ssive (recommended)" msgstr "被动 (推荐)(&S)" -#: ../../locales/../src/interface/Mainfrm.cpp:2320 +#: ../../locales/../src/interface/Mainfrm.cpp:2322 msgid "Parameter not a valid URL" msgstr "参数不是有效的 URL" -#: ../../locales/../src/interface/updater.cpp:542 +#: ../../locales/../src/interface/updater.cpp:543 #, c-format msgid "Parsing %d bytes of version information.\n" msgstr "解析版本信息的 %d 个字节。\n" @@ -5398,13 +5423,13 @@ 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:597 +#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../locales/../src/interface/netconfwizard.cpp:621 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 "要求提供密码" @@ -5413,13 +5438,13 @@ msgid "Path" msgstr "路径" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3057 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2239 +#: ../../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 "无法为目录 %s 和子目录 %s 构造路径" -#: ../../locales/../src/interface/Mainfrm.cpp:2278 +#: ../../locales/../src/interface/Mainfrm.cpp:2280 msgid "Path not found:" msgstr "路径未找到:" @@ -5438,8 +5463,8 @@ msgid "Permission" msgstr "权限" -#: ../../locales/../src/engine/socket.cpp:1046 -#: ../../locales/../src/engine/socket.cpp:1055 +#: ../../locales/../src/engine/socket.cpp:1032 +#: ../../locales/../src/engine/socket.cpp:1041 msgid "Permission denied" msgstr "权限不足" @@ -5452,7 +5477,7 @@ msgid "Platform:" msgstr "平台:" -#: ../../locales/../src/interface/netconfwizard.cpp:569 +#: ../../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." @@ -5467,11 +5492,11 @@ msgstr "" "请配置使用了的任何防火墙或路由器，让 FileZilla 可以通过任意端口建立外部连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:639 +#: ../../locales/../src/interface/netconfwizard.cpp:632 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router." msgstr "请禁用路由器中类似于“DMZ 模式”或“Game 模式”的设置。" -#: ../../locales/../src/interface/netconfwizard.cpp:578 +#: ../../locales/../src/interface/netconfwizard.cpp:571 msgid "" "Please ensure you have a stable internet connection and carefully check your " "settings again." @@ -5504,7 +5529,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”输入新名称。" @@ -5534,7 +5559,7 @@ msgid "Please enter a password for this server:" msgstr "请为该服务器输入密码:" -#: ../../locales/../src/interface/QueueView.cpp:2112 +#: ../../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" @@ -5550,7 +5575,7 @@ "Please enter a timeout between 10 and 9999 seconds or 0 to disable timeouts." 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 "请为该过滤器集合输入一个唯一的名称" @@ -5558,11 +5583,11 @@ msgid "Please enter a username for this server:" msgstr "请为该服务器输入用户名:" -#: ../../locales/../src/interface/netconfwizard.cpp:198 +#: ../../locales/../src/interface/netconfwizard.cpp:187 msgid "Please enter a valid portrange." msgstr "请输入有效的端口范围。" -#: ../../locales/../src/interface/netconfwizard.cpp:177 +#: ../../locales/../src/interface/netconfwizard.cpp:168 msgid "Please enter an URL where to get your external address from" msgstr "请输入您用以获取外部地址的 URL" @@ -5572,7 +5597,7 @@ msgid "Please enter an upload speed limit greater or equal to 0 %s/s." msgstr "请输入大于等于 0 %s/s 的上传速度限制。" -#: ../../locales/../src/interface/Mainfrm.cpp:571 +#: ../../locales/../src/interface/Mainfrm.cpp:572 msgid "" "Please enter raw FTP command.\n" "Using raw ftp commands will clear the directory cache." @@ -5580,14 +5605,14 @@ "请输入原始 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/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 "请输入将要创建的文件名:" @@ -5595,12 +5620,12 @@ msgid "Please enter username and password for this server:" msgstr "请为该服务器输入用户名和密码:" -#: ../../locales/../src/interface/netconfwizard.cpp:158 +#: ../../locales/../src/interface/netconfwizard.cpp:152 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: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 " @@ -5615,17 +5640,17 @@ "prevent successful FTP connections." msgstr "请认真按照提示进行，因为错误的配置将会阻止 FTP 连接。" -#: ../../locales/../src/interface/netconfwizard.cpp:633 +#: ../../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 "请确保 FileZilla 被允许建立向外的连接并且输入了正确的已解析地址。" -#: ../../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 "请确认要求的区域配置已安装在系统里。" -#: ../../locales/../src/interface/netconfwizard.cpp:610 +#: ../../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 " @@ -5646,7 +5671,7 @@ "墙认为只有木马或其它有害软件才会用到的端口。这可能会引发一个错误的警告，您可" "以安全地忽略掉。" -#: ../../locales/../src/interface/Mainfrm.cpp:686 +#: ../../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." @@ -5660,7 +5685,7 @@ "often or in too short intervals." msgstr "请注意如果您过于频繁的尝试连接，或者间隔过短，某些服务器会阻止您。" -#: ../../locales/../src/interface/netconfwizard.cpp:586 +#: ../../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 " @@ -5669,7 +5694,7 @@ "当网络环境发生改变，或者突然发生之前能用的服务器无法连接的问题，请再次运行本" "向导。" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3221 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3228 msgid "Please select an action:" msgstr "请选择一个动作:" @@ -5704,7 +5729,7 @@ msgid "Please select the new attributes for the selected files." msgstr "请为选定的文件选择新的属性。" -#: ../../locales/../src/interface/netconfwizard.cpp:597 +#: ../../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. " @@ -5734,11 +5759,11 @@ msgstr "预分配" #: ../../locales/../src/interface/sitemanager.cpp:270 -#: ../../locales/../src/interface/sitemanager_dialog.cpp:1901 +#: ../../locales/../src/interface/sitemanager_dialog.cpp:1904 msgid "Predefined Sites" msgstr "预定义的站点" -#: ../../locales/../src/interface/Mainfrm.cpp:685 +#: ../../locales/../src/interface/Mainfrm.cpp:686 msgid "Preserving file timestamps" msgstr "保留文件时间戳" @@ -5746,7 +5771,7 @@ msgid "Preview:" msgstr "预览:" -#: ../../locales/../src/engine/tlssocket.cpp:1112 +#: ../../locales/../src/engine/tlssocket.cpp:1136 msgid "Primary connection and data connection certificates don't match." msgstr "主连接和数据连接的证书不匹配。" @@ -5762,7 +5787,7 @@ msgid "Prioritize directories (default)" msgstr "目录优先(默认)" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Priority" msgstr "优先级" @@ -5792,7 +5817,7 @@ msgid "Process &Queue" msgstr "处理队列(&Q)" -#: ../../locales/../src/engine/socket.cpp:1051 +#: ../../locales/../src/engine/socket.cpp:1037 msgid "Process file table overflow" msgstr "进程文件表溢出" @@ -5802,11 +5827,11 @@ msgid "Processed %s in %s." msgstr "已处理 %s 个文件， %s 个目录。" -#: ../../locales/../src/engine/socket.cpp:1056 +#: ../../locales/../src/engine/socket.cpp:1042 msgid "Protocol not supported" msgstr "不支持该协议" -#: ../../locales/../src/engine/socket.cpp:1110 +#: ../../locales/../src/engine/socket.cpp:1096 msgid "Protocol not supported on given socket type" msgstr "指定的套接字类型不支持该协议" @@ -5823,7 +5848,7 @@ msgid "Proxy &user:" msgstr "代理用户(&U):" -#: ../../locales/../src/engine/proxy.cpp:471 +#: ../../locales/../src/engine/proxy.cpp:494 msgid "Proxy authentication failed" msgstr "代理认证失败" @@ -5833,26 +5858,30 @@ msgid "Proxy handshake failed: %s" msgstr "代理握手失败: %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4212 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4227 msgid "Proxy host starts with '[' but no closing bracket found." msgstr "代理主机以“[”开始，但没有闭合括号。" -#: ../../locales/../src/engine/proxy.cpp:329 +#: ../../locales/../src/engine/proxy.cpp:352 #, 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:535 +#, c-format +msgid "Proxy request failed. Reply from proxy: %s" +msgstr "代理请求失败。代理服务器返回: %s" + +#: ../../locales/../src/engine/proxy.cpp:407 #, c-format msgid "Proxy request failed: %s" msgstr "代理请求失败: %s" -#: ../../locales/../src/engine/proxy.cpp:536 +#: ../../locales/../src/engine/proxy.cpp:559 msgid "Proxy request failed: Unknown address type in CONNECT reply" msgstr "代理请求失败: CONNECT 回复了未知的地址类型" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4241 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256 msgid "Proxy set but proxy host or port invalid" msgstr "已设定代理服务器，但代理地址或端口设置无效" @@ -5868,7 +5897,7 @@ msgid "Public permissions" msgstr "公共权限" -#: ../../locales/../src/interface/QueueView.cpp:3057 +#: ../../locales/../src/interface/QueueView.cpp:3054 msgid "Queue has been fully processed" msgstr "队列已全部处理" @@ -5887,11 +5916,11 @@ msgid "Queue: empty" msgstr "队列: 空" -#: ../../locales/../src/interface/QueueView.cpp:434 +#: ../../locales/../src/interface/QueueView.cpp:438 msgid "Queued files" msgstr "列队的文件" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3157 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3164 msgid "Queueing:" msgstr "列队中:" @@ -5908,7 +5937,7 @@ msgid "R&eset and requeue selected files" msgstr "重置并重新请求所选的文件(&E)" -#: ../../locales/../src/interface/Mainfrm.cpp:585 +#: ../../locales/../src/interface/Mainfrm.cpp:586 msgid "Raw FTP command" msgstr "原始 FTP 命令" @@ -5925,7 +5954,7 @@ msgid "Re&name" msgstr "重命名(&N)" -#: ../../locales/../src/interface/netconfwizard.cpp:592 +#: ../../locales/../src/interface/netconfwizard.cpp:585 msgid "" "Re-run the wizard and carefully check your settings and configure all " "routers and firewalls accordingly." @@ -5939,44 +5968,44 @@ msgid "Read-only" msgstr "只读" -#: ../../locales/../src/interface/Mainfrm.cpp:1022 +#: ../../locales/../src/interface/Mainfrm.cpp:1023 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:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Reason" msgstr "原因" -#: ../../locales/../src/interface/QueueView.cpp:3050 +#: ../../locales/../src/interface/QueueView.cpp:3047 msgid "Reboot now" msgstr "马上重启" @@ -5984,36 +6013,36 @@ msgid "Rec&urse into subdirectories" msgstr "递归处理子目录(&U)" -#: ../../locales/../src/engine/tlssocket.cpp:201 +#: ../../locales/../src/engine/tlssocket.cpp:225 #, c-format msgid "Received TLS alert from the server: %s (%d)" msgstr "收到服务器的 TLS 警告: %s (%d)" -#: ../../locales/../src/engine/directorylistingparser.cpp:2958 +#: ../../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:1992 -#: ../../locales/../src/engine/directorylistingparser.cpp:2006 +#: ../../locales/../src/engine/directorylistingparser.cpp:2008 msgid "Received a line exceeding 10000 characters, aborting." msgstr "接收到超过 1000 个字符的行，中止。" -#: ../../locales/../src/interface/netconfwizard.cpp:1007 -#: ../../locales/../src/interface/netconfwizard.cpp:1016 -#: ../../locales/../src/interface/netconfwizard.cpp:1039 +#: ../../locales/../src/interface/netconfwizard.cpp:989 +#: ../../locales/../src/interface/netconfwizard.cpp:997 +#: ../../locales/../src/interface/netconfwizard.cpp:1018 msgid "Received data tainted" msgstr "已收到的数据被损坏" -#: ../../locales/../src/interface/updater.cpp:521 +#: ../../locales/../src/interface/updater.cpp:522 msgid "Received invalid character in version information" msgstr "在版本信息中收到了无效字符" -#: ../../locales/../src/engine/tlssocket.cpp:204 +#: ../../locales/../src/engine/tlssocket.cpp:228 #, 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:515 msgid "Received version information is too large" msgstr "接收的版本信息过长" @@ -6046,13 +6075,13 @@ msgid "Recursively deleting files and directories." 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" @@ -6062,7 +6091,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 "记住密码？" @@ -6070,20 +6099,20 @@ msgid "Remote" msgstr "远程" -#: ../../locales/../src/engine/tlssocket.cpp:830 +#: ../../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:1204 +#: ../../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 "远程文件搜索" @@ -6119,11 +6148,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 "远程路径处理:" @@ -6163,26 +6192,26 @@ msgid "Rename selected files and directories" msgstr "重命令选定的文件和文件夹" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3396 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2438 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3397 +#: ../../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:398 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:401 msgid "Request failed - client's identd could not confirm the user ID string" msgstr "请求失败 - 客户端的 identd 无法确认用户标识字符串" -#: ../../locales/../src/engine/proxy.cpp:372 +#: ../../locales/../src/engine/proxy.cpp:395 msgid "Request rejected or failed" msgstr "请求被拒或失败" @@ -6198,28 +6227,28 @@ msgid "Reset and requeue &all" msgstr "重置并重新请求所有(&A)" -#: ../../locales/../src/engine/socket.cpp:1098 +#: ../../locales/../src/engine/socket.cpp:1084 msgid "Resolved protocol is unknown" msgstr "解析的协议为未知协议" -#: ../../locales/../src/engine/ControlSocket.cpp:1081 -#: ../../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 的地址" -#: ../../locales/../src/engine/socket.cpp:1057 +#: ../../locales/../src/engine/socket.cpp:1043 msgid "Resource temporarily unavailable" msgstr "资源暂不可用" -#: ../../locales/../src/engine/logging.cpp:112 +#: ../../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 "响应:" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3085 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3092 msgid "Results:" msgstr "结果:" @@ -6236,19 +6265,19 @@ "ending format than the client." msgstr "如果服务器使用不同格式的行结尾，继续传输 ASCII 格式文件可能导致问题。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1272 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:939 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1273 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:924 #, 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/ftpcontrolsocket.cpp:1270 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:921 msgid "Retrieving directory listing..." msgstr "读取目录列表..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3772 -#: ../../locales/../src/interface/netconfwizard.cpp:720 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3773 +#: ../../locales/../src/interface/netconfwizard.cpp:710 #, c-format msgid "Retrieving external IP address from %s" msgstr "从 %s 得到外部 IP 地址" @@ -6265,7 +6294,7 @@ msgid "S&hutdown system" msgstr "关闭系统(&H)" -#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3030 +#: ../../locales/../src/interface/resources/xrc/dialogs.xrc:3037 msgid "S&top" msgstr "停止(&T)" @@ -6285,7 +6314,7 @@ msgid "SOC&KS 4" msgstr "SOC&KS 4" -#: ../../locales/../src/engine/proxy.cpp:154 +#: ../../locales/../src/engine/proxy.cpp:177 #, c-format msgid "SOCKS4 proxy will connect to: %s" msgstr "SOCKS4 代理将连接到: %s" @@ -6294,16 +6323,16 @@ msgid "SQLite:" msgstr "SQLite:" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 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 "您禁止了保存密码。" @@ -6316,11 +6345,11 @@ 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):" @@ -6336,8 +6365,8 @@ msgid "Security information" msgstr "安全信息" -#: ../../locales/../src/interface/netconfwizard.cpp:580 -#: ../../locales/../src/interface/netconfwizard.cpp:593 +#: ../../locales/../src/interface/netconfwizard.cpp:573 +#: ../../locales/../src/interface/netconfwizard.cpp:586 msgid "See also: https://wiki.filezilla-project.org/Network_Configuration" msgstr "参见: https://wiki.filezilla-project.org/Network_Configuration" @@ -6384,7 +6413,7 @@ msgstr "选择用于导出数据的文件" #: ../../locales/../src/interface/export.cpp:34 -#: ../../locales/../src/interface/queue.cpp:1489 +#: ../../locales/../src/interface/queue.cpp:1495 msgid "Select file for exported queue" msgstr "选择用于导出列队的文件" @@ -6393,7 +6422,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 "选择用于导出站点的文件" @@ -6401,23 +6430,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 +#: ../../locales/../src/interface/fzputtygen_interface.cpp:128 msgid "Select filename for converted key file" 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 "选择目标文件名" @@ -6429,7 +6458,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." @@ -6441,7 +6470,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." @@ -6459,7 +6488,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 进行传输。" @@ -6497,7 +6526,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 "选择的过滤器只针对本地文件。" @@ -6521,7 +6550,7 @@ msgid "Send custom command to the server otherwise not available" msgstr "发送自定义命令到服务器，如果可用的话" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332 msgid "Sending keep-alive command" msgstr "发出保持连接指令" @@ -6534,77 +6563,77 @@ msgid "Server &Type:" msgstr "服务器类型(&T):" -#: ../../locales/../src/engine/tlssocket.cpp:719 +#: ../../locales/../src/engine/tlssocket.cpp:743 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/ftpcontrolsocket.cpp:891 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:944 msgid "Server does not support non-ASCII characters." msgstr "服务器不支持非 ASCII 字符。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4153 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4168 #, c-format msgid "Server does not support resume of files > %d GB." msgstr "服务器不支持续传大于 %d GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4149 +#: ../../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 "服务器不支持续传大于 %d GB 的文件。当文件大小吻合时传输终止。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2426 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2427 msgid "Server does not support resume of files > 2GB." msgstr "服务器不支持续传大于 2 GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2422 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2423 msgid "Server does not support resume of files > 4GB." msgstr "服务器不支持续传大于 4 GB 的文件。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4164 +#: ../../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 "服务器也许不支持续传大于 %d GB 的文件。当文件大小吻合时传输终止。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:840 msgid "" "Server might require an account. Try specifying an account using the Site " "Manager" msgstr "服务器可能需要帐号。请尝试在站点管理器里指定一个帐号" -#: ../../locales/../src/engine/ControlSocket.cpp:344 +#: ../../locales/../src/engine/ControlSocket.cpp:345 msgid "Server returned empty path." msgstr "服务器发送了空路径。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675 +#: ../../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:3719 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3720 msgid "Server sent passive reply with unroutable address. Passive mode failed." msgstr "服务器发回了不可路由的地址。被动模式失败。" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3715 msgid "" "Server sent passive reply with unroutable address. Using server address " "instead." msgstr "服务器发回了不可路由的地址。使用服务器地址代替。" -#: ../../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: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:517 -#: ../../locales/../src/interface/netconfwizard.cpp:526 -#: ../../locales/../src/interface/netconfwizard.cpp:537 +#: ../../locales/../src/interface/netconfwizard.cpp:519 +#: ../../locales/../src/interface/netconfwizard.cpp:530 msgid "Server sent unexpected reply." msgstr "服务器发送了意外的回应。" @@ -6620,7 +6649,7 @@ msgid "Server&type:" msgstr "服务器类型(&T):" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Server/Local file" msgstr "服务器/本地文件" @@ -6637,8 +6666,8 @@ msgid "Set &Priority" msgstr "设定优先级(&P)" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3544 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2317 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3545 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2298 #, c-format msgid "Set permissions of '%s' to '%s'" msgstr "修改“%s”的权限为“%s”" @@ -6663,7 +6692,7 @@ msgid "Show &welcome dialog..." msgstr "显示欢迎对话框(&W)..." -#: ../../locales/../src/interface/Mainfrm.cpp:2168 +#: ../../locales/../src/interface/Mainfrm.cpp:2170 msgid "Show both directory trees and continue comparing?" msgstr "要显示两边的目录树并进行比较吗？" @@ -6683,7 +6712,7 @@ msgid "Shows this help dialog" msgstr "显示这个帮助对话框" -#: ../../locales/../src/interface/QueueView.cpp:3046 +#: ../../locales/../src/interface/QueueView.cpp:3043 msgid "Shutdown now" msgstr "马上关闭系统" @@ -6757,7 +6786,7 @@ "站点特定书签需要将服务器保存在站点管理器中。\n" "将当前连接加入站点管理器码？" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Size" msgstr "大小" @@ -6776,43 +6805,43 @@ 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: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:1156 -#: ../../locales/../src/engine/ControlSocket.cpp:1172 -#: ../../locales/../src/engine/ControlSocket.cpp:1197 -#: ../../locales/../src/engine/ControlSocket.cpp:1257 +#: ../../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:1047 msgid "Socket address outside address space" msgstr "套接字地址超出了地址空间范围" -#: ../../locales/../src/engine/socket.cpp:1063 +#: ../../locales/../src/engine/socket.cpp:1049 msgid "Socket already connected" msgstr "套接字已连接" -#: ../../locales/../src/engine/socket.cpp:1071 +#: ../../locales/../src/engine/socket.cpp:1057 msgid "Socket has been shut down" msgstr "套接字已关闭" -#: ../../locales/../src/engine/socket.cpp:1068 +#: ../../locales/../src/engine/socket.cpp:1054 msgid "Socket not connected" msgstr "套接字未连接" -#: ../../locales/../src/engine/socket.cpp:1111 +#: ../../locales/../src/engine/socket.cpp:1097 msgid "Socket type not supported for address family" msgstr "地址集不支持此套接字类型" -#: ../../locales/../src/interface/Mainfrm.cpp:1157 +#: ../../locales/../src/interface/Mainfrm.cpp:1158 msgid "Some files are still being edited or need to be uploaded." msgstr "部分文件正被编辑或者需要上传。" @@ -6827,7 +6856,7 @@ msgid "Sort directories inline" msgstr "在原位置排序目录列表" -#: ../../locales/../src/interface/filelistctrl.cpp:464 +#: ../../locales/../src/interface/filelistctrl.cpp:466 msgid "Sort order cannot be changed if comparing directories." msgstr "对比目录时不能改变目录排序。" @@ -6843,7 +6872,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 "来源和目标文件不能相同" @@ -6855,7 +6884,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" @@ -6893,19 +6922,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:2146 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1583 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2147 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1568 #, c-format msgid "Starting download of %s" msgstr "开始下载 %s" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2149 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1586 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2150 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1571 #, c-format msgid "Starting upload of %s" msgstr "开始上传 %s" @@ -6919,11 +6948,11 @@ msgstr "州或省:" #: ../../locales/../src/interface/edithandler.cpp:1087 -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Status" msgstr "状态" -#: ../../locales/../src/engine/logging.cpp:109 +#: ../../locales/../src/engine/logging.cpp:110 #: ../../locales/../src/interface/StatusView.cpp:295 #: ../../locales/../src/interface/StatusView.cpp:370 msgid "Status:" @@ -6953,34 +6982,34 @@ msgid "Summary of test results:" msgstr "测试结果总结:" -#: ../../locales/../src/interface/QueueView.cpp:3054 +#: ../../locales/../src/interface/QueueView.cpp:3051 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: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:944 -#: ../../locales/../src/interface/state.cpp:953 -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:947 +#: ../../locales/../src/interface/state.cpp:973 msgid "Synchronized browsing" msgstr "同步浏览" -#: ../../locales/../src/interface/state.cpp:370 +#: ../../locales/../src/interface/state.cpp:371 msgid "Synchronized browsing has been disabled." msgstr "同步浏览已经被关闭。" @@ -6994,8 +7023,8 @@ #: ../../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:2282 +#: ../../locales/../src/interface/Mainfrm.cpp:2324 msgid "Syntax error in command line" msgstr "命令行语法错误" @@ -7007,11 +7036,11 @@ msgid "System details" msgstr "系统信息" -#: ../../locales/../src/engine/socket.cpp:1052 +#: ../../locales/../src/engine/socket.cpp:1038 msgid "System limit of open files exceeded" msgstr "达到了系统打开文件数限制" -#: ../../locales/../src/engine/socket.cpp:1109 +#: ../../locales/../src/engine/socket.cpp:1095 msgid "System's network subsystem has failed" msgstr "系统的网络子系统出错" @@ -7019,19 +7048,19 @@ msgid "T&oolbar" msgstr "工具栏(&O)" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:300 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:302 msgid "TLS connection established, sending HTTP request" msgstr "TLS 连接已建立，正在发送 HTTP 请求" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:404 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:405 msgid "TLS connection established, waiting for welcome message..." msgstr "TLS 连接建立，等待欢迎消息..." -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:408 msgid "TLS connection established." msgstr "TLS 连接已建立。" -#: ../../locales/../src/engine/proxy.cpp:499 +#: ../../locales/../src/engine/proxy.cpp:522 msgid "TTL expired" msgstr "TTL 超时" @@ -7043,15 +7072,15 @@ 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:1068 msgid "Temporary failure in name resolution" msgstr "名字解析中临时出错" @@ -7059,7 +7088,7 @@ msgid "Test results" msgstr "测试结果" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4170 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4185 msgid "Testing resume capabilities of server" msgstr "正在检测服务器能否续传" @@ -7084,16 +7113,16 @@ "站点管理器已经在另一个 FileZilla 3 中打开。\n" "请将其关闭，否则数据将无法删除。" -#: ../../locales/../src/interface/netconfwizard.cpp:634 +#: ../../locales/../src/interface/netconfwizard.cpp:627 #, c-format msgid "The address you entered was: %s" msgstr "您输入的地址是: %s" -#: ../../locales/../src/engine/socket.cpp:1088 +#: ../../locales/../src/engine/socket.cpp:1074 msgid "The ai_family member is not supported" msgstr "不支持 ai_family 成员" -#: ../../locales/../src/engine/socket.cpp:1101 +#: ../../locales/../src/engine/socket.cpp:1087 msgid "The ai_socktype member is not supported" msgstr "不支持 ai_socktype 成员" @@ -7129,12 +7158,12 @@ 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”。" @@ -7145,7 +7174,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”已经在列表里了" @@ -7161,7 +7190,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" @@ -7191,7 +7220,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" @@ -7201,7 +7230,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" @@ -7222,7 +7251,7 @@ "打开新版本的文件可能会导致数据丢失。\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" @@ -7269,7 +7298,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 解决方案" @@ -7289,17 +7318,17 @@ msgid "The limit needs to be between 1 and 2000 MiB" msgstr "限制必须在 1 到 2000 MiB 之间。" -#: ../../locales/../src/interface/state.cpp:979 +#: ../../locales/../src/interface/state.cpp:973 #, c-format msgid "The local directory '%s' could not be created." msgstr "无法创建本地目录“%s”。" -#: ../../locales/../src/interface/state.cpp:964 +#: ../../locales/../src/interface/state.cpp:958 #, c-format msgid "The local directory '%s' does not exist." 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" @@ -7308,7 +7337,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." @@ -7322,16 +7351,16 @@ msgid "The new version has been saved in your Downloads directory." msgstr "新版本已经被保存在您的 下载 文件夹。" -#: ../../locales/../src/interface/QueueView.cpp:1832 +#: ../../locales/../src/interface/QueueView.cpp:1829 msgid "The queue will not be saved." msgstr "队列将不会被保存。" -#: ../../locales/../src/interface/state.cpp:891 +#: ../../locales/../src/interface/state.cpp:885 #, c-format msgid "The remote directory '%s' does not exist." msgstr "远程目录“%s”不存在。" -#: ../../locales/../src/interface/state.cpp:935 +#: ../../locales/../src/interface/state.cpp:929 #, c-format msgid "" "The remote directory '%s' is not below the synchronization root (%s).\n" @@ -7373,7 +7402,7 @@ msgid "The server could not be added." msgstr "无法添加该服务器。" -#: ../../locales/../src/interface/netconfwizard.cpp:590 +#: ../../locales/../src/interface/netconfwizard.cpp:583 msgid "The server sent an unexpected or unrecognized reply." msgstr "服务器发送了意外的或不可识别的回应。" @@ -7402,7 +7431,7 @@ "the computer you think it is." msgstr "该服务器的主机密匙是未知的。不能保证该服务器就是您所认定的那台计算机。" -#: ../../locales/../src/engine/socket.cpp:1100 +#: ../../locales/../src/engine/socket.cpp:1086 msgid "The servname parameter is not supported for ai_socktype" msgstr "ai_socktype 不支持 servname 参数" @@ -7412,19 +7441,19 @@ "settings to have effect." msgstr "已导入设置，您需要重新启动 FileZilla 使所有设置生效。" -#: ../../locales/../src/engine/socket.cpp:1048 +#: ../../locales/../src/engine/socket.cpp:1034 msgid "The specified address family is not supported" msgstr "不支持指定的地址集" -#: ../../locales/../src/engine/socket.cpp:1113 +#: ../../locales/../src/engine/socket.cpp:1099 msgid "The specified network name is no longer available" msgstr "指定的网络名称已不可用" -#: ../../locales/../src/interface/QueueView.cpp:3049 +#: ../../locales/../src/interface/QueueView.cpp:3046 msgid "The system will soon reboot unless you click Cancel." msgstr "除非您按下取消，否则系统将会马上重启。" -#: ../../locales/../src/interface/QueueView.cpp:3045 +#: ../../locales/../src/interface/QueueView.cpp:3042 msgid "The system will soon shut down unless you click Cancel." msgstr "除非您按下取消，否则系统将会马上关闭。" @@ -7436,7 +7465,7 @@ "目标文件已经存在。\n" "请选择处理方法。" -#: ../../locales/../src/interface/netconfwizard.cpp:858 +#: ../../locales/../src/interface/netconfwizard.cpp:846 msgid "The test did not succeed. Do you really want to save the settings?" msgstr "测试不成功。您真的要保存配置吗？" @@ -7449,15 +7478,15 @@ 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:591 +#: ../../locales/../src/interface/netconfwizard.cpp:584 msgid "" "This means that some router and/or firewall is still interfering with " "FileZilla." @@ -7475,7 +7504,7 @@ "you have and tests your configuration." msgstr "本向导会帮助您正确地配置任何您使用的路由器和防火墙，并且测试您的配置。" -#: ../../locales/../src/interface/queue.cpp:1204 +#: ../../locales/../src/interface/queue.cpp:1210 msgid "Time" msgstr "时间" @@ -7488,12 +7517,12 @@ msgstr "超时秒数(&O):" #: ../../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:1621 -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1047 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1622 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1032 #, c-format msgid "Timezone offset of server is %d seconds." msgstr "服务器时差为 %d 秒。" @@ -7502,11 +7531,11 @@ msgid "Title:" msgstr "标题:" -#: ../../locales/../src/interface/Mainfrm.cpp:2166 +#: ../../locales/../src/interface/Mainfrm.cpp:2168 msgid "To compare directories, both file lists have to be aligned." msgstr "两边的文件列表必须排列整齐才能比较目录。" -#: ../../locales/../src/interface/Mainfrm.cpp:2167 +#: ../../locales/../src/interface/Mainfrm.cpp:2169 msgid "To do this, the directory trees need to be both shown or both hidden." msgstr "两边的目录树必须同时显示或隐藏才能执行此动作。" @@ -7566,15 +7595,15 @@ 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 "标题行太长" -#: ../../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/engine/logging.cpp:114 #: ../../locales/../src/interface/StatusView.cpp:289 #: ../../locales/../src/interface/StatusView.cpp:356 msgid "Trace:" @@ -7611,11 +7640,11 @@ msgid "Transfer connection interrupted: %s" msgstr "传输连接被打断: %s" -#: ../../locales/../src/interface/netconfwizard.cpp:637 +#: ../../locales/../src/interface/netconfwizard.cpp:630 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 "正在传输" @@ -7624,8 +7653,8 @@ msgid "Transfers" msgstr "传输" +#: ../../locales/../src/interface/QueueView.cpp:2944 #: ../../locales/../src/interface/QueueView.cpp:2947 -#: ../../locales/../src/interface/QueueView.cpp:2950 msgid "Transfers finished" msgstr "传输完成" @@ -7637,11 +7666,11 @@ msgid "Treat the &following filetypes as ASCII files:" msgstr "把以下的文件类型作为 ASCII 格式文件对待(&F):" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:846 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:831 msgid "Trust changed Hostkey:" msgstr "信任改变后的主机密钥:" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:844 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:829 msgid "Trust new Hostkey:" msgstr "信任新的主机密钥:" @@ -7679,7 +7708,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):" @@ -7689,15 +7718,15 @@ 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" -#: ../../locales/../src/engine/proxy.cpp:381 -#: ../../locales/../src/engine/proxy.cpp:508 +#: ../../locales/../src/engine/proxy.cpp:404 +#: ../../locales/../src/engine/proxy.cpp:531 #, c-format msgid "Unassigned error code %d" msgstr "未知错误代码 %d" @@ -7711,11 +7740,11 @@ msgid "Unknown" msgstr "未知" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:685 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:686 msgid "Unknown FTP proxy type, cannot generate login sequence." msgstr "未知 FTP 代理服务器类型，无法生成登录过程。" -#: ../../locales/../src/engine/proxy.cpp:429 +#: ../../locales/../src/engine/proxy.cpp:452 #, c-format msgid "Unknown SOCKS protocol version: %d" msgstr "未知 SOCKS 协议版本: %d" @@ -7728,7 +7757,7 @@ msgid "Unknown host key" msgstr "未定义的快捷键" -#: ../../locales/../src/engine/proxy.cpp:437 +#: ../../locales/../src/engine/proxy.cpp:460 #, c-format msgid "" "Unknown protocol version of SOCKS Username/Password Authentication " @@ -7740,24 +7769,24 @@ "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/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 "除非问题被修复，主动模式 FTP 不会工作，只能使用被动模式。" -#: ../../locales/../src/interface/netconfwizard.cpp:599 +#: ../../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 "除非问题被修复，主动模式 FTP 不会工作，只能使用被动模式。" -#: ../../locales/../src/engine/tlssocket.cpp:1074 +#: ../../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 "不支持的重定向" @@ -7827,12 +7856,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)" @@ -7858,8 +7887,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:" @@ -7893,7 +7922,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 "用户名不能是一系列的空格" @@ -7915,7 +7944,7 @@ msgid "Verbose log messages from wxWidgets" msgstr "来自 wxWidgets 的详细日志消息" -#: ../../locales/../src/engine/tlssocket.cpp:1124 +#: ../../locales/../src/engine/tlssocket.cpp:1148 msgid "Verifying certificate..." msgstr "正在验证证书..." @@ -7923,7 +7952,7 @@ msgid "Very high" msgstr "非常高" -#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1391 +#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1392 msgid "View hidden option set, but unsupported by server" msgstr "已经设置了显示隐藏的选项，但是服务器端并未支持" @@ -7939,15 +7968,15 @@ msgid "W&rite" msgstr "写入(&R)" -#: ../../locales/../src/interface/QueueView.cpp:1670 +#: ../../locales/../src/interface/QueueView.cpp:1671 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 "等待密码" @@ -7959,7 +7988,7 @@ msgid "Waiting to retry..." msgstr "正在等待重试..." -#: ../../locales/../src/interface/netconfwizard.cpp:975 +#: ../../locales/../src/interface/netconfwizard.cpp:958 msgid "Warning, ignoring data connection from wrong IP." msgstr "警告，忽略从错误 IP 接入的数据。" @@ -7981,11 +8010,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 "更新" @@ -7993,7 +8022,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." @@ -8014,7 +8043,7 @@ 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 记住密码吗？" @@ -8022,20 +8051,20 @@ msgid "Wr&ite" msgstr "写入(&I)" -#: ../../locales/../src/interface/netconfwizard.cpp:449 -#: ../../locales/../src/interface/netconfwizard.cpp:456 +#: ../../locales/../src/interface/netconfwizard.cpp:445 +#: ../../locales/../src/interface/netconfwizard.cpp:451 msgid "Wrong external IP address" msgstr "错误的外部 IP 地址" -#: ../../locales/../src/engine/httpcontrolsocket.cpp:781 +#: ../../locales/../src/engine/httpcontrolsocket.cpp:784 msgid "Wrong line endings" msgstr "错误的行结尾" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:858 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:843 msgid "Yes" msgstr "是" -#: ../../locales/../src/interface/netconfwizard.cpp:777 +#: ../../locales/../src/interface/netconfwizard.cpp:766 msgid "" "You appear to be using an IPv6-only host. This wizard does not support this " "environment." @@ -8045,7 +8074,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 "您总是可以在帮助菜单中再次打开这个对话框。" @@ -8079,24 +8108,24 @@ 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 "您选择编辑超过 10 个文件，真的要继续吗？" -#: ../../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 "您选择打开超过 10 个文件或目录，真的要继续吗？" -#: ../../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 "请输入一个主机名称。" @@ -8105,30 +8134,30 @@ msgid "You have to enter a key file path" 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:165 -#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89 -msgid "You have to enter a valid IP address." -msgstr "请输入正确的 IP 地址。" +#: ../../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:638 +#: ../../locales/../src/interface/netconfwizard.cpp:631 msgid "" "You likely have a router or firewall which erroneously modified the " "transferred data." @@ -8175,29 +8204,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:584 +#: ../../locales/../src/interface/netconfwizard.cpp:577 msgid "" "You should have no problems connecting to other servers, file transfers " "should work properly." msgstr "连接到其它服务应该没有问题，文件传输也能正常工作了。" -#: ../../locales/../src/interface/QueueView.cpp:3053 +#: ../../locales/../src/interface/QueueView.cpp:3050 msgid "Your computer will suspend unless you click Cancel." msgstr "如果不按下 取消，系统将会马上挂起。" @@ -8222,7 +8251,7 @@ msgid "contains" msgstr "包含" -#: ../../locales/../src/interface/updater.cpp:216 +#: ../../locales/../src/interface/updater.cpp:217 msgid "custom" msgstr "自定义" @@ -8244,19 +8273,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:531 +#: ../../locales/../src/interface/filelistctrl.cpp:550 +#: ../../locales/../src/interface/filelistctrl.cpp:577 +#: ../../locales/../src/interface/filelistctrl.cpp:593 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 " @@ -8265,15 +8294,15 @@ "fzputtygen 无法启动。\n" "请确认其执行程序和 FileZilla 执行程序在相同的目录内。" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:467 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:452 msgid "fzsftp belongs to a different version of FileZilla" msgstr "fzsftp 是其他 FileZilla 版本里的命令" -#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1510 +#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1495 msgid "fzsftp could not be started" msgstr "fzsftp 无法启动" -#: ../../locales/../src/engine/tlssocket.cpp:1103 +#: ../../locales/../src/engine/tlssocket.cpp:1127 msgid "gnutls_certificate_get_peers returned no certificates" msgstr "gnutls_certificate_get_peers 没有返回证书" @@ -8329,10 +8358,10 @@ msgid "owner writeable" msgstr "所有者可写" -#: ../../locales/../src/engine/proxy.cpp:84 -#: ../../locales/../src/engine/tlssocket.cpp:1167 -#: ../../locales/../src/engine/tlssocket.cpp:1178 -#: ../../locales/../src/engine/tlssocket.cpp:1193 +#: ../../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 "未知" @@ -8353,6 +8382,24 @@ msgid "wxWidgets:" msgstr "wxWidgets:" +#~ msgid "Deleting directories" +#~ 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 "使用系统默认值(&S)" + +#~ msgid "Use system &defaults" +#~ msgstr "使用系统默认值(&D)" + #~ 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 " diff -Nru filezilla-3.14.1/m4/check_atomic.m4 filezilla-3.15.0.2/m4/check_atomic.m4 --- filezilla-3.14.1/m4/check_atomic.m4 2015-08-19 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/m4/check_atomic.m4 2016-02-05 08:54:45.000000000 +0000 @@ -30,7 +30,7 @@ AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) - AC_MSG_FAILURE([cannot figure our how to use std::atomic]) + AC_MSG_FAILURE([cannot figure out how to use std::atomic]) ]) ]) diff -Nru filezilla-3.14.1/m4/check_libc++.m4 filezilla-3.15.0.2/m4/check_libc++.m4 --- filezilla-3.14.1/m4/check_libc++.m4 2014-06-20 17:47:38.000000000 +0000 +++ filezilla-3.15.0.2/m4/check_libc++.m4 2016-02-05 08:54:45.000000000 +0000 @@ -2,6 +2,13 @@ dnl which for some insane reason defaults to an ancient stdlibc++ :( dnl To check for this, we try to use std::forward from +dnl Copyright (c) 2015-2016 Tim Kosse + +dnl Copying and distribution of this file, with or without modification, are +dnl permitted in any medium without royalty provided the copyright notice +dnl and this notice are preserved. This file is offered as-is, without any +dnl warranty. + AC_DEFUN([CHECK_LIBCXX], [ AC_LANG_PUSH(C++) diff -Nru filezilla-3.14.1/Makefile.in filezilla-3.15.0.2/Makefile.in --- filezilla-3.14.1/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -296,6 +296,8 @@ 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@ diff -Nru filezilla-3.14.1/NEWS filezilla-3.15.0.2/NEWS --- filezilla-3.14.1/NEWS 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/NEWS 2016-02-10 19:27:09.000000000 +0000 @@ -10,6 +10,42 @@ *nix: Unix (e.g BSD) and Unix-like systems (e.g. Linux) OS X: Apple Mac OS X +3.15.0.2 (2016-02-10) + +- MSW: Binaries are now also signed using a SHA256 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 +- MSW: Double-clicking a divider between a list header in the queue now adjust the sizes in the other tabs just as dragging the width would + +3.15.0.1 (2016-02-02) + +- Fix for search dialog not displaying the results from the last visited directory of a search + +3.15.0 (2016-01-30) + ++ MSW: Display notification bubble if FileZilla isn't in the forgeground and all active transfers have finished. + +3.15.0-rc1 (2016-01-23) + +- Fix regression from 3.16.0-beta1 where extra data being appended to some downloaded files +- Fix setting initial pane sizes when creating new tabs +- OS X: Fix display of issuer and subject details in certificate verification dialog +- Updated SFTP components from PuTTY +- Official binaries now link against GnuTLS 3.4.8 +- Official binaries now link against SQLite 3.10.2 + +3.15.0-beta1 (2016-01-13) + ++ Building FileZilla now depends on libfilezilla 0.3.0 (https://lib.filezilla-project.org/). ++ Added support for downloading and deleting multiple unrelated directories from the search dialog ++ *nix: Vastly speed up line-ending conversion when downloading files using the ASCII data type ++ Improved compatibility with broken servers omitting the mandatory 1yz reply to transfer commands +- Fix handling of SFTP keyfiles with non-ASCII characters in their paths +- Add missing directory comparison checkbox to new bookmark dialog +- MSW: Installer now sets appid on desktop icon +- Updated built-in pugixml + 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. diff -Nru filezilla-3.14.1/README filezilla-3.15.0.2/README --- filezilla-3.14.1/README 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/README 2016-02-05 08:54:46.000000000 +0000 @@ -1,7 +1,7 @@ FileZilla Client ---------------- - Copyright (C) 2004-2015 Tim Kosse + Copyright (C) 2004-2016 Tim Kosse https://filezilla-project.org/ Overview diff -Nru filezilla-3.14.1/src/dbus/Makefile.in filezilla-3.15.0.2/src/dbus/Makefile.in --- filezilla-3.14.1/src/dbus/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/src/dbus/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -236,6 +236,8 @@ 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@ diff -Nru filezilla-3.14.1/src/Dependencies.props.example filezilla-3.15.0.2/src/Dependencies.props.example --- filezilla-3.14.1/src/Dependencies.props.example 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/Dependencies.props.example 2016-02-05 08:54:46.000000000 +0000 @@ -2,19 +2,33 @@ + + + + x:\xample\libfilezilla\lib + 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\sqlite-amalgamation-3080200 x:\xample\sqlite-amalgamation-3080200 + + + - $(wxwidgets_include);$(gnutls_include);$(sqlite3_include);$(IncludePath) - $(wxwidgets_lib);$(gnutls_lib);$(sqlite3_lib);$(LibraryPath) + $(libfilezilla_include);$(wxwidgets_include);$(gnutls_include);$(sqlite3_include);$(IncludePath) + $(libfilezilla_lib);$(wxwidgets_lib);$(gnutls_lib);$(sqlite3_lib);$(LibraryPath) + + $(libfilezilla_include) + + + $(libfilezilla_lib) + $(wxwidgets_include) diff -Nru filezilla-3.14.1/src/engine/backend.cpp filezilla-3.15.0.2/src/engine/backend.cpp --- filezilla-3.14.1/src/engine/backend.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/backend.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,7 +4,7 @@ #include "socket.h" #include -CBackend::CBackend(CEventHandler* pEvtHandler) : m_pEvtHandler(pEvtHandler) +CBackend::CBackend(fz::event_handler* pEvtHandler) : m_pEvtHandler(pEvtHandler) { } @@ -13,7 +13,7 @@ RemoveSocketEvents(m_pEvtHandler, this); } -CSocketBackend::CSocketBackend(CEventHandler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter) +CSocketBackend::CSocketBackend(fz::event_handler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter) : CBackend(pEvtHandler) , socket_(socket) , m_rateLimiter(rateLimiter) @@ -71,10 +71,10 @@ return socket_.Peek(buffer, len, error); } -void CSocketBackend::OnRateAvailable(enum CRateLimiter::rate_direction direction) +void CSocketBackend::OnRateAvailable(CRateLimiter::rate_direction direction) { if (direction == CRateLimiter::outbound) - m_pEvtHandler->SendEvent(this, SocketEventType::write, 0); + m_pEvtHandler->send_event(this, SocketEventType::write, 0); else - m_pEvtHandler->SendEvent(this, SocketEventType::read, 0); + m_pEvtHandler->send_event(this, SocketEventType::read, 0); } diff -Nru filezilla-3.14.1/src/engine/backend.h filezilla-3.15.0.2/src/engine/backend.h --- filezilla-3.14.1/src/engine/backend.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/backend.h 2016-02-05 08:54:46.000000000 +0000 @@ -7,7 +7,7 @@ class CBackend : public CRateLimiterObject, public CSocketEventSource { public: - CBackend(CEventHandler* pEvtHandler); + CBackend(fz::event_handler* pEvtHandler); virtual ~CBackend(); CBackend(CBackend const&) = delete; @@ -17,17 +17,17 @@ virtual int Peek(void *buffer, unsigned int size, int& error) = 0; virtual int Write(const void *buffer, unsigned int size, int& error) = 0; - virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction) = 0; + virtual void OnRateAvailable(CRateLimiter::rate_direction direction) = 0; protected: - CEventHandler* const m_pEvtHandler; + fz::event_handler* const m_pEvtHandler; }; class CSocket; class CSocketBackend final : public CBackend { public: - CSocketBackend(CEventHandler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter); + CSocketBackend(fz::event_handler* pEvtHandler, CSocket & socket, CRateLimiter& rateLimiter); virtual ~CSocketBackend(); // Backend definitions virtual int Read(void *buffer, unsigned int size, int& error); @@ -35,7 +35,7 @@ virtual int Write(const void *buffer, unsigned int size, int& error); protected: - virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction); + virtual void OnRateAvailable(CRateLimiter::rate_direction direction); CSocket &socket_; CRateLimiter& m_rateLimiter; diff -Nru filezilla-3.14.1/src/engine/ControlSocket.cpp filezilla-3.15.0.2/src/engine/ControlSocket.cpp --- filezilla-3.14.1/src/engine/ControlSocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ControlSocket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -2,14 +2,16 @@ #include "ControlSocket.h" #include "directorycache.h" #include "engineprivate.h" -#include "event_loop.h" -#include "local_filesys.h" #include "local_path.h" #include "logging_private.h" #include "proxy.h" #include "servercapabilities.h" #include "sizeformatting_base.h" +#include +#include +#include + #include #include @@ -26,7 +28,7 @@ #endif struct obtain_lock_event_type; -typedef CEvent CObtainLockEvent; +typedef fz::simple_event CObtainLockEvent; std::list CControlSocket::m_lockInfoList; @@ -49,7 +51,7 @@ CControlSocket::CControlSocket(CFileZillaEnginePrivate & engine) : CLogging(engine) - , CEventHandler(engine.event_loop_) + , event_handler(engine.event_loop_) , engine_(engine) { m_pCurOpData = 0; @@ -66,7 +68,7 @@ CControlSocket::~CControlSocket() { - RemoveHandler(); + remove_handler(); DoClose(); @@ -96,7 +98,7 @@ CTransferStatus const status = engine_.transfer_status_.Get(tmp); if (!status.empty() && (nErrorCode == FZ_REPLY_OK || status.madeProgress)) { - int elapsed = static_cast((CDateTime::Now() - status.started).get_seconds()); + int elapsed = static_cast((fz::datetime::now() - status.started).get_seconds()); if (elapsed <= 0) elapsed = 1; wxString time = wxString::Format( @@ -256,14 +258,14 @@ wxString CControlSocket::ConvertDomainName(wxString const& domain) { #ifdef __WXMSW__ - int len = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain, domain.size() + 1, 0, 0); + int len = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.wc_str(), domain.size() + 1, 0, 0); if (!len) { LogMessage(MessageType::Debug_Warning, _T("Could not convert domain name")); return domain; } wchar_t* output = new wchar_t[len]; - int res = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain, domain.size() + 1, output, len); + int res = IdnToAscii(IDN_ALLOW_UNASSIGNED, domain.wc_str(), domain.size() + 1, output, len); if (!res) { delete [] output; LogMessage(MessageType::Debug_Warning, _T("Could not convert domain name")); @@ -387,7 +389,7 @@ found = false; if (!pData->download) { - if (!found && pData->remoteFileSize < 0 && !pData->fileTime.IsValid()) + if (!found && pData->remoteFileSize < 0 && !pData->fileTime.empty()) return FZ_REPLY_OK; } @@ -408,13 +410,13 @@ else pNotification->canResume = false; - pNotification->localTime = CLocalFileSystem::GetModificationTime(pData->localFile); + pNotification->localTime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); - if (pData->fileTime.IsValid()) + if (pData->fileTime.empty()) pNotification->remoteTime = pData->fileTime; if (found) { - if (!pData->fileTime.IsValid()) { + if (!pData->fileTime.empty()) { if (entry.has_date()) { pNotification->remoteTime = entry.time; pData->fileTime = entry.time; @@ -545,32 +547,32 @@ return buffer; } -void CControlSocket::OnTimer(timer_id) +void CControlSocket::OnTimer(fz::timer_id) { m_timer = 0; // It's a one-shot timer, no need to stop it int const timeout = engine_.GetOptions().GetOptionVal(OPTION_TIMEOUT); if (timeout > 0) { - duration elapsed = CMonotonicClock::now() - m_lastActivity; + fz::duration elapsed = fz::monotonic_clock::now() - m_lastActivity; if ((!m_pCurOpData || !m_pCurOpData->waitForAsyncRequest) && !IsWaitingForLock()) { - if (elapsed > duration::from_seconds(timeout)) { + 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); DoClose(FZ_REPLY_TIMEOUT); return; } } else { - elapsed = duration(); + elapsed = fz::duration(); } - m_timer = AddTimer(duration::from_milliseconds(timeout * 1000) - elapsed, true); + m_timer = add_timer(fz::duration::from_milliseconds(timeout * 1000) - elapsed, true); } } void CControlSocket::SetAlive() { - m_lastActivity = CMonotonicClock::now(); + m_lastActivity = fz::monotonic_clock::now(); } void CControlSocket::SetWait(bool wait) @@ -579,16 +581,16 @@ if (m_timer) return; - m_lastActivity = CMonotonicClock::now(); + m_lastActivity = fz::monotonic_clock::now(); int timeout = engine_.GetOptions().GetOptionVal(OPTION_TIMEOUT); if (!timeout) return; - m_timer = AddTimer(duration::from_milliseconds(timeout * 1000 + 100), true); // Add a bit of slack + m_timer = add_timer(fz::duration::from_milliseconds(timeout * 1000 + 100), true); // Add a bit of slack } else { - StopTimer(m_timer); + stop_timer(m_timer); m_timer = 0; } } @@ -740,7 +742,7 @@ continue; // Send notification - lockInfo.pControlSocket->SendEvent(); + lockInfo.pControlSocket->send_event(); break; } } @@ -812,13 +814,13 @@ } } -duration CControlSocket::GetTimezoneOffset() const +fz::duration CControlSocket::GetTimezoneOffset() const { - duration ret; + fz::duration ret; if (m_pCurrentServer) { int seconds = 0; if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset, &seconds) == yes) { - ret = duration::from_seconds(seconds); + ret = fz::duration::from_seconds(seconds); } } return ret; @@ -899,9 +901,9 @@ return true; } -void CRealControlSocket::operator()(CEventBase const& ev) +void CRealControlSocket::operator()(fz::event_base const& ev) { - if (!Dispatch(ev, this, + if (!fz::dispatch(ev, this, &CRealControlSocket::OnSocketEvent, &CRealControlSocket::OnHostAddress)) { @@ -1076,8 +1078,9 @@ port = m_pCurrentServer->GetPort(); } } - if (!IsIpAddress(host)) + if (fz::get_address_type(host.ToStdWstring()) == fz::address_type::unknown) { LogMessage(MessageType::Status, _("Resolving address of %s"), host); + } int res = m_pSocket->Connect(host, port); @@ -1137,11 +1140,11 @@ SendNextCommand(); break; case CFileExistsNotification::overwriteNewer: - if (!pFileExistsNotification->localTime.IsValid() || !pFileExistsNotification->remoteTime.IsValid()) + if (!pFileExistsNotification->localTime.empty() || !pFileExistsNotification->remoteTime.empty()) SendNextCommand(); - else if (pFileExistsNotification->download && pFileExistsNotification->localTime.IsEarlierThan(pFileExistsNotification->remoteTime)) + else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) SendNextCommand(); - else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.IsLaterThan(pFileExistsNotification->remoteTime)) + else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) SendNextCommand(); else { @@ -1174,15 +1177,15 @@ } break; case CFileExistsNotification::overwriteSizeOrNewer: - if (!pFileExistsNotification->localTime.IsValid() || !pFileExistsNotification->remoteTime.IsValid()) + 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)) SendNextCommand(); - else if (pFileExistsNotification->download && pFileExistsNotification->localTime.IsEarlierThan(pFileExistsNotification->remoteTime)) + else if (pFileExistsNotification->download && pFileExistsNotification->localTime.earlier_than(pFileExistsNotification->remoteTime)) SendNextCommand(); - else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.IsLaterThan(pFileExistsNotification->remoteTime)) + else if (!pFileExistsNotification->download && pFileExistsNotification->localTime.later_than(pFileExistsNotification->remoteTime)) SendNextCommand(); else { @@ -1213,7 +1216,7 @@ int64_t size; bool isLink; - if (CLocalFileSystem::GetFileInfo(pData->localFile, isLink, &size, 0, 0) == CLocalFileSystem::file) + 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; @@ -1238,7 +1241,7 @@ break; } else { - pData->fileTime = CDateTime(); + pData->fileTime = fz::datetime(); pData->remoteFileSize = -1; } @@ -1287,7 +1290,7 @@ local_path.AddSegment(*iter); #ifdef __WXMSW__ - BOOL res = CreateDirectory(local_path.GetPath(), 0); + BOOL res = CreateDirectory(local_path.GetPath().wc_str(), 0); if (!res && GetLastError() != ERROR_ALREADY_EXISTS) break; #else @@ -1351,12 +1354,11 @@ return FZ_REPLY_NOTSUPPORTED; } -void CControlSocket::operator()(CEventBase const& ev) +void CControlSocket::operator()(fz::event_base const& ev) { - if (Dispatch(ev, this, &CControlSocket::OnTimer)) { - return; - } - Dispatch(ev, this, &CControlSocket::OnObtainLock); + fz::dispatch(ev, this, + &CControlSocket::OnTimer, + &CControlSocket::OnObtainLock); } void CControlSocket::SetActive(CFileZillaEngine::_direction direction) diff -Nru filezilla-3.14.1/src/engine/ControlSocket.h filezilla-3.15.0.2/src/engine/ControlSocket.h --- filezilla-3.14.1/src/engine/ControlSocket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ControlSocket.h 2016-02-10 19:27:09.000000000 +0000 @@ -46,7 +46,7 @@ CServerPath remotePath; const bool download; - CDateTime fileTime; + fz::datetime fileTime; int64_t localFileSize{-1}; int64_t remoteFileSize{-1}; @@ -111,7 +111,7 @@ }; class CTransferStatus; -class CControlSocket: public CLogging, public CEventHandler +class CControlSocket: public CLogging, public fz::event_handler { public: CControlSocket(CFileZillaEnginePrivate & engine); @@ -171,7 +171,7 @@ void InvalidateCurrentWorkingDir(const CServerPath& path); protected: - duration GetTimezoneOffset() const; + fz::duration GetTimezoneOffset() const; virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED); bool m_closed; @@ -204,8 +204,8 @@ bool m_useUTF8; // Timeout data - timer_id m_timer{}; - CMonotonicClock m_lastActivity; + fz::timer_id m_timer{}; + fz::monotonic_clock m_lastActivity; // ------------------------- // Begin cache locking stuff @@ -256,9 +256,9 @@ bool m_invalidateCurrentPath; - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); - void OnTimer(timer_id id); + void OnTimer(fz::timer_id id); void OnObtainLock(); }; @@ -278,7 +278,7 @@ virtual int DoClose(int nErrorCode = FZ_REPLY_DISCONNECTED); void ResetSocket(); - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); void OnHostAddress(CSocketEventSource* source, wxString const& address); diff -Nru filezilla-3.14.1/src/engine/directorycache.cpp filezilla-3.15.0.2/src/engine/directorycache.cpp --- filezilla-3.14.1/src/engine/directorycache.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/directorycache.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -26,7 +26,7 @@ void CDirectoryCache::Store(const CDirectoryListing &listing, const CServer &server) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = CreateServerEntry(server); wxASSERT(sit != m_serverList.end()); @@ -37,7 +37,7 @@ bool unused; if (Lookup(cit, sit, listing.path, true, unused)) { auto & entry = const_cast(*cit); - entry.modificationTime = CMonotonicClock::now(); + entry.modificationTime = fz::monotonic_clock::now(); m_totalFileCount -= cit->listing.GetCount(); entry.listing = listing; @@ -54,7 +54,7 @@ bool CDirectoryCache::Lookup(CDirectoryListing &listing, const CServer &server, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -84,7 +84,7 @@ if (!allowUnsureEntries && entry.listing.get_unsure_flags()) return false; - is_outdated = (CMonotonicClock::now() - entry.listing.m_firstListTime).get_seconds() > CACHE_TIMEOUT; + is_outdated = (fz::monotonic_clock::now() - entry.listing.m_firstListTime).get_seconds() > CACHE_TIMEOUT; return true; } } @@ -94,7 +94,7 @@ bool CDirectoryCache::DoesExist(const CServer &server, const CServerPath &path, int &hasUnsureEntries, bool &is_outdated) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -111,7 +111,7 @@ bool CDirectoryCache::LookupFile(CDirentry &entry, const CServer &server, const CServerPath &path, const wxString& file, bool &dirDidExist, bool &matchedCase) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) { @@ -148,7 +148,7 @@ bool CDirectoryCache::InvalidateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool *wasDir /*=false*/) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -169,7 +169,7 @@ } } entry.listing.m_flags |= CDirectoryListing::unsure_unknown; - entry.modificationTime = CMonotonicClock::now(); + entry.modificationTime = fz::monotonic_clock::now(); } return true; @@ -177,7 +177,7 @@ bool CDirectoryCache::UpdateFile(const CServer &server, const CServerPath &path, const wxString& filename, bool mayCreate, enum Filetype type /*=file*/, int64_t size /*=-1*/) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -239,7 +239,7 @@ } else entry.listing.m_flags |= CDirectoryListing::unsure_unknown; - entry.modificationTime = CMonotonicClock::now(); + entry.modificationTime = fz::monotonic_clock::now(); updated = true; } @@ -249,7 +249,7 @@ bool CDirectoryCache::RemoveFile(const CServer &server, const CServerPath &path, const wxString& filename) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -285,7 +285,7 @@ } entry.listing.m_flags |= CDirectoryListing::unsure_invalid; } - entry.modificationTime = CMonotonicClock::now(); + entry.modificationTime = fz::monotonic_clock::now(); } return true; @@ -293,7 +293,7 @@ void CDirectoryCache::InvalidateServer(const CServer& server) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); for (auto iter = m_serverList.begin(); iter != m_serverList.end(); ++iter) { @@ -317,9 +317,9 @@ } } -bool CDirectoryCache::GetChangeTime(CMonotonicClock& time, const CServer &server, const CServerPath &path) +bool CDirectoryCache::GetChangeTime(fz::monotonic_clock& time, const CServer &server, const CServerPath &path) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) @@ -337,7 +337,7 @@ void CDirectoryCache::RemoveDir(const CServer& server, const CServerPath& path, const wxString& filename, const CServerPath&) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); // TODO: This is not 100% foolproof and may not work properly // Perhaps just throw away the complete cache? @@ -372,7 +372,7 @@ void CDirectoryCache::Rename(const CServer& server, const CServerPath& pathFrom, const wxString& fileFrom, const CServerPath& pathTo, const wxString& fileTo) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tServerIter sit = GetServerEntry(server); if (sit == m_serverList.end()) diff -Nru filezilla-3.14.1/src/engine/directorycache.h filezilla-3.15.0.2/src/engine/directorycache.h --- filezilla-3.14.1/src/engine/directorycache.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/directorycache.h 2016-02-05 08:54:46.000000000 +0000 @@ -14,7 +14,8 @@ version. */ -#include +#include + #include const int CACHE_TIMEOUT = 900; // In seconds @@ -36,7 +37,7 @@ CDirectoryCache& operator=(CDirectoryCache const&) = delete; void Store(const CDirectoryListing &listing, const CServer &server); - bool GetChangeTime(CMonotonicClock& time, const CServer &server, const CServerPath &path); + 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); @@ -58,11 +59,11 @@ explicit CCacheEntry(CDirectoryListing const& l) : listing(l) - , modificationTime(CMonotonicClock::now()) + , modificationTime(fz::monotonic_clock::now()) {} CDirectoryListing listing; - CMonotonicClock modificationTime; + fz::monotonic_clock modificationTime; CCacheEntry& operator=(CCacheEntry const& a) = default; CCacheEntry& operator=(CCacheEntry && a) noexcept = default; @@ -96,7 +97,7 @@ bool Lookup(tCacheIter &cacheIter, tServerIter &sit, const CServerPath &path, bool allowUnsureEntries, bool& is_outdated); - mutex mutex_; + fz::mutex mutex_; std::list m_serverList; diff -Nru filezilla-3.14.1/src/engine/directorylisting.cpp filezilla-3.15.0.2/src/engine/directorylisting.cpp --- filezilla-3.14.1/src/engine/directorylisting.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/directorylisting.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,13 +4,13 @@ { 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, - target ? *target : wxString(), flags & flag_unsure); + target ? *target : std::wstring(), flags & flag_unsure); if( has_date() ) { - str += _T("date=") + time.Format(_T("%Y-%m-%d"), CDateTime::local) + _T("\n"); + str += _T("date=") + time.format(_T("%Y-%m-%d"), fz::datetime::local) + _T("\n"); } if( has_time() ) { - str += _T("time=") + time.Format(_T("%H-%M-%S"), CDateTime::local) + _T("\n"); + str += _T("time=") + time.format(_T("%H-%M-%S"), fz::datetime::local) + _T("\n"); } return str; } @@ -123,7 +123,7 @@ return true; } -void CDirectoryListing::GetFilenames(std::vector &names) const +void CDirectoryListing::GetFilenames(std::vector &names) const { names.reserve(GetCount()); for (unsigned int i = 0; i < GetCount(); ++i) @@ -139,7 +139,7 @@ m_searchmap_case.Get(); // Search map - auto iter = m_searchmap_case->find(to_fzstring(name)); + auto iter = m_searchmap_case->find(to_wstring(name)); if (iter != m_searchmap_case->end()) return iter->second; @@ -152,8 +152,8 @@ // Build map if not yet complete std::vector >::const_iterator entry_iter = m_entries->begin() + i; for (; entry_iter != m_entries->end(); ++entry_iter, ++i) { - fzstring const& entry_name = (*entry_iter)->name; - searchmap_case.insert(std::pair(entry_name, i)); + std::wstring const& entry_name = (*entry_iter)->name; + searchmap_case.insert(std::pair(entry_name, i)); if (entry_name == name) return i; @@ -174,7 +174,7 @@ name.MakeLower(); // Search map - auto iter = m_searchmap_nocase->find(to_fzstring(name)); + auto iter = m_searchmap_nocase->find(to_wstring(name)); if (iter != m_searchmap_nocase->end()) return iter->second; @@ -189,7 +189,7 @@ for (; entry_iter != m_entries->end(); ++entry_iter, ++i) { wxString entry_name = (*entry_iter)->name; entry_name.MakeLower(); - searchmap_nocase.insert(std::pair(to_fzstring(entry_name), i)); + searchmap_nocase.insert(std::pair(to_wstring(entry_name), i)); if (entry_name == name) return i; diff -Nru filezilla-3.14.1/src/engine/directorylistingparser.cpp filezilla-3.15.0.2/src/engine/directorylistingparser.cpp --- filezilla-3.14.1/src/engine/directorylistingparser.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/directorylistingparser.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -5,7 +5,7 @@ #include #include -std::map CDirectoryListingParser::m_MonthNamesMap; +std::map CDirectoryListingParser::m_MonthNamesMap; //#define LISTDEBUG_MVS //#define LISTDEBUG @@ -19,7 +19,7 @@ namespace { struct ObjectCache { - CRefcountObject const& get(fzstring const& v) + CRefcountObject const& get(std::wstring const& v) { auto it = std::lower_bound(cache.begin(), cache.end(), v); @@ -32,7 +32,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; }; @@ -58,12 +58,12 @@ hex }; - CToken(wxChar const* p, unsigned int len) + CToken(wchar_t const* p, unsigned int len) : m_pToken(p) , m_len(len) {} - wxChar const* GetToken() const + wchar_t const* GetToken() const { return m_pToken; } @@ -73,13 +73,13 @@ return m_len; } - fzstring GetString() const + std::wstring GetString() const { if (!m_pToken || !m_len) { - return fzstring(); + return std::wstring(); } else { - return fzstring(m_pToken, m_len); + return std::wstring(m_pToken, m_len); } } @@ -113,7 +113,7 @@ bool IsNumeric(unsigned int start, unsigned int len) { - for (unsigned int i = start; i < wxMin(start + len, m_len); ++i) + 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; @@ -145,7 +145,7 @@ return m_rightNumeric == Yes; } - int Find(const wxChar* chr, int start = 0) const + int Find(const wchar_t* chr, int start = 0) const { if (!chr) return -1; @@ -159,7 +159,7 @@ return -1; } - int Find(wxChar chr, int start = 0) const + int Find(wchar_t chr, int start = 0) const { if (!m_pToken) return -1; @@ -227,7 +227,7 @@ { int64_t number = 0; for (unsigned int i = 0; i < m_len; ++i) { - const wxChar& c = m_pToken[i]; + const wchar_t& c = m_pToken[i]; if (c >= '0' && c <= '9') { number *= 16; number += c - '0'; @@ -248,7 +248,7 @@ } } - wxChar operator[](unsigned int n) const + wchar_t operator[](unsigned int n) const { if (n >= m_len) return 0; @@ -257,7 +257,7 @@ } protected: - wxChar const* m_pToken{}; + wchar_t const* m_pToken{}; unsigned int m_len{}; TokenInformation m_numeric{Unknown}; @@ -269,13 +269,13 @@ class CLine { public: - CLine(wxChar* p, int len = -1, int trailing_whitespace = 0) + CLine(wchar_t* p, int len = -1, int trailing_whitespace = 0) { m_pLine = p; if (len >= 0) m_len = len; else - m_len = wxStrlen(p); + m_len = fz::strlen(p); m_parsePos = 0; @@ -343,7 +343,7 @@ CToken ref; if (!GetToken(prev, ref)) return false; - wxChar const* p = ref.GetToken() + ref.GetLength() + 1; + wchar_t const* p = ref.GetToken() + ref.GetLength() + 1; auto const newLen = m_len - (p - m_pLine); if (newLen <= 0) { @@ -364,7 +364,7 @@ for (unsigned int i = static_cast(m_LineEndTokens.size()); i <= n; ++i) { const CToken *refToken = m_Tokens[i]; - const wxChar* p = refToken->GetToken(); + const wchar_t* p = refToken->GetToken(); auto const newLen = m_len - (p - m_pLine) - m_trailing_whitespace; if (newLen <= 0) { return false; @@ -380,10 +380,10 @@ CLine *Concat(const CLine *pLine) const { int newLen = m_len + pLine->m_len + 1; - wxChar* p = new wxChar[newLen]; - memcpy(p, m_pLine, m_len * sizeof(wxChar)); + 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(wxChar)); + 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); } @@ -399,7 +399,7 @@ int m_parsePos; int m_len; int m_trailing_whitespace; - wxChar* m_pLine; + wchar_t* m_pLine; unsigned int offset_{}; }; @@ -599,20 +599,19 @@ // Some servers send a combination of month name and number, // Add corresponding numbers to the month names. - std::map combo; - for (auto iter = m_MonthNamesMap.begin(); iter != m_MonthNamesMap.end(); ++iter) - { + 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)] = iter->second; - combo[wxString::Format(_T("%s%02d"), iter->first, iter->second - 1)] = iter->second; + 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)] = iter->second; + 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)] = iter->second; + 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)] = iter->second; + 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)] = iter->second; + combo[wxString::Format(_T("%s%d"), iter->first, (iter->second - 1) % 10).ToStdWstring()] = iter->second; } m_MonthNamesMap.insert(combo.begin(), combo.end()); @@ -694,7 +693,7 @@ { CDirectoryListing listing; listing.path = path; - listing.m_firstListTime = CMonotonicClock::now(); + listing.m_firstListTime = fz::monotonic_clock::now(); if (!ParseData(false)){ listing.m_flags |= CDirectoryListing::listing_failed; @@ -833,7 +832,7 @@ if (serverType == VMS && entry.is_dir()) { // Trim version information from directories auto pos = entry.name.rfind(';'); - if (pos != fzstring::npos && pos > 0) + if (pos != std::wstring::npos && pos > 0) entry.name = entry.name.substr(0, pos); } @@ -844,8 +843,8 @@ if (line.GetToken(0, t)) { int64_t seconds = t.GetNumber(); if (seconds > 0 && seconds <= 0xffffffffll) { - CDateTime time(static_cast(seconds), CDateTime::seconds); - if (time.IsValid()) { + fz::datetime time(static_cast(seconds), fz::datetime::seconds); + if (time.empty()) { entry.time = time; } } @@ -855,7 +854,7 @@ { auto const timezoneOffset = m_server.GetTimezoneOffset(); if (timezoneOffset) { - entry.time += duration::from_minutes(timezoneOffset); + entry.time += fz::duration::from_minutes(timezoneOffset); } } @@ -876,7 +875,7 @@ if (!line.GetToken(index, token)) return false; - wxChar chr = token[0]; + wchar_t chr = token[0]; if (chr != 'b' && chr != 'c' && chr != 'd' && @@ -886,7 +885,7 @@ chr != '-') return false; - fzstring permissions = token.GetString(); + std::wstring permissions = token.GetString(); entry.flags = 0; @@ -921,7 +920,7 @@ // Reset index index = startindex; - fzstring ownerGroup; + std::wstring ownerGroup; for (int i = 0; i < numOwnerGroup; ++i) { if (!line.GetToken(++index, token)) return false; @@ -945,17 +944,17 @@ if (!ownerGroup.empty()) ownerGroup += _T(" "); - wxString const group = token.GetString(); + std::wstring const group = token.GetString(); int i; - for( i = group.size() - 1; + for (i = group.size() - 1; i >= 0 && group[i] >= '0' && group[i] <= '9'; - --i ) {} + --i) {} - ownerGroup += group.Left(i + 1); + ownerGroup += group.substr(0, i + 1); } if (expect_date) { - entry.time = CDateTime(); + entry.time = fz::datetime(); if (!ParseUnixDateTime(line, index, entry)) continue; } @@ -975,8 +974,8 @@ if (entry.is_link()) { size_t pos; - if ((pos = entry.name.find(_T(" -> "))) != fzstring::npos) { - entry.target = CSparseOptional(entry.name.substr(pos + 4)); + if ((pos = entry.name.find(_T(" -> "))) != std::wstring::npos) { + entry.target = CSparseOptional(entry.name.substr(pos + 4)); entry.name = entry.name.substr(0, pos); } } @@ -1036,7 +1035,7 @@ if (token[pos] == '.') return true; - tm t = entry.time.GetTm(CDateTime::utc); + tm t = entry.time.get_tm(fz::datetime::utc); year = t.tm_year + 1900; month = t.tm_mon + 1; day = t.tm_mday; @@ -1106,20 +1105,20 @@ } if (month < 1) { - wxString strMonth = dateMonth.GetString(); - if (dateMonth.IsLeftNumeric() && (unsigned int)strMonth[strMonth.Length() - 1] > 127) { + std::wstring strMonth = dateMonth.GetString(); + if (dateMonth.IsLeftNumeric() && (unsigned int)strMonth[strMonth.size() - 1] > 127) { // Most likely an Asian server sending some unknown language specific // suffix at the end of the monthname. Filter it out. int i; - for (i = strMonth.Length() - 1; i > 0; --i) { + for (i = strMonth.size() - 1; i > 0; --i) { if (strMonth[i] >= '0' && strMonth[i] <= '9') break; } - strMonth = strMonth.Left(i + 1); + strMonth = strMonth.substr(0, i + 1); } // Check month name - while (strMonth.Right(1) == _T(",") || strMonth.Right(1) == _T(".")) - strMonth.RemoveLast(); + while (!strMonth.empty() && (strMonth.back() == ',' || strMonth.back() == '.')) + strMonth.pop_back(); if (!GetMonthFromName(strMonth, month)) return false; } @@ -1148,7 +1147,7 @@ // Some servers use times only for files newer than 6 months if( year <= 0 ) { wxASSERT( month != -1 && day != -1 ); - tm const t = CDateTime::Now().GetTm(CDateTime::utc); + 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; int const fileDayOfYear = day + 31 * (month - 1); @@ -1204,7 +1203,7 @@ else --index; - if (!entry.time.Set(CDateTime::utc, year, month, day, hour, minute)) { + if (!entry.time.set(fz::datetime::utc, year, month, day, hour, minute)) { return false; } @@ -1233,7 +1232,7 @@ // Seems to be monthname-dd-yy // Check month name - wxString dateMonth = token.GetString().substr(0, pos); + std::wstring const dateMonth = token.GetString().substr(0, pos); if (!GetMonthFromName(dateMonth, month)) return false; gotMonth = true; @@ -1309,7 +1308,7 @@ if (gotYear || gotDay) { // Month field in yyyy-mm-dd or dd-mm-yyyy // Check month name - wxString dateMonth = token.GetString().substr(pos + 1, pos2 - pos - 1); + std::wstring dateMonth = token.GetString().substr(pos + 1, pos2 - pos - 1); if (!GetMonthFromName(dateMonth, month)) return false; gotMonth = true; @@ -1348,7 +1347,7 @@ wxASSERT(gotMonth); wxASSERT(gotDay); - if (!entry.time.Set(CDateTime::utc, year, month, day)) { + if (!entry.time.set(fz::datetime::utc, year, month, day)) { return false; } @@ -1410,7 +1409,7 @@ entry.name = token.GetString(); entry.target.clear(); - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; entry.time += m_timezoneOffset; @@ -1464,7 +1463,7 @@ hour = 0; } - return entry.time.ImbueTime(hour, minute, seconds); + return entry.time.imbue_time(hour, minute, seconds); } bool CDirectoryListingParser::ParseAsEplf(CLine &line, CDirentry &entry) @@ -1485,7 +1484,7 @@ entry.flags = 0; entry.size = -1; - fzstring permissions; + std::wstring permissions; int fact = 1; while (fact < pos) { @@ -1511,7 +1510,7 @@ int64_t number = token.GetNumber(fact + 1, len - 1); if (number < 0) return false; - entry.time = CDateTime(static_cast(number), CDateTime::seconds); + entry.time = fz::datetime(static_cast(number), fz::datetime::seconds); } else if (type == 'u' && len > 2 && token[fact + 1] == 'p') permissions = token.GetString().substr(fact + 2, len - 2); @@ -1520,16 +1519,16 @@ } entry.permissions = objcache.get(permissions); - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); return true; } namespace { -wxString Unescape(const wxString& str, wxChar escape) +std::wstring Unescape(const std::wstring& str, wchar_t escape) { - wxString res; + std::wstring res; for (unsigned int i = 0; i < str.size(); ++i) { - wxChar c = str[i]; + wchar_t c = str[i]; if (c == escape) { ++i; if (i == str.size() || !str[i]) { @@ -1574,8 +1573,8 @@ if (!line.GetToken(++index, token)) return false; - fzstring ownerGroup; - fzstring permissions; + std::wstring ownerGroup; + std::wstring permissions; // 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()) { @@ -1737,7 +1736,7 @@ } entry.ownerGroup = objcache.get(ownerGroupToken.GetString()); - entry.permissions = objcache.get(fzstring()); + entry.permissions = objcache.get(std::wstring()); entry.time += m_timezoneOffset; @@ -1769,7 +1768,7 @@ if (firstToken.GetLength() >= 2 && firstToken[1] == '4') entry.flags |= CDirentry::flag_dir; - fzstring ownerGroup = token.GetString(); + std::wstring ownerGroup = token.GetString(); if (!line.GetToken(++index, token)) return false; @@ -1792,7 +1791,7 @@ int64_t number = token.GetNumber(); if (number < 0) return false; - entry.time = CDateTime(static_cast(number), CDateTime::seconds); + entry.time = fz::datetime(static_cast(number), fz::datetime::seconds); // Get filename if (!line.GetToken(++index, token, true)) @@ -1813,7 +1812,7 @@ entry.size = firstToken.GetNumber(); // Get date - wxString dateMonth = token.GetString(); + std::wstring dateMonth = token.GetString(); int month = 0; if (!GetMonthFromName(dateMonth, month)) { // OS/2 or nortel.VxWorks @@ -1846,8 +1845,7 @@ entry.name = token.GetString(); if (entry.name.size() >= 5) { - wxString type = entry.name.substr(entry.name.size() - 5); - MakeLowerAscii(type); + std::wstring type = fz::str_tolower_ascii(entry.name.substr(entry.name.size() - 5)); if (!skippedCount && type == _T("")) { entry.flags |= CDirentry::flag_dir; entry.name = entry.name.substr(0, entry.name.size() - 5); @@ -1881,7 +1879,7 @@ else if (year < 1000) year += 1900; - if( !entry.time.Set(CDateTime::utc, year, month, day) ) { + if (!entry.time.set(fz::datetime::utc, year, month, day)) { return false; } @@ -1904,7 +1902,7 @@ } } entry.target.clear(); - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; entry.time += m_timezoneOffset; } @@ -1925,7 +1923,7 @@ return ParseData(true); } -bool CDirectoryListingParser::AddLine(wxChar const* pLine) +bool CDirectoryListingParser::AddLine(wchar_t const* pLine) { if (m_pControlSocket) m_pControlSocket->LogMessageRaw(MessageType::RawList, pLine); @@ -1936,11 +1934,11 @@ if (!*pLine) return false; - const int len = wxStrlen(pLine); + const int len = fz::strlen(pLine); - wxChar* p = new wxChar[len + 1]; + wchar_t* p = new wchar_t[len + 1]; - wxStrcpy(p, pLine); + wcscpy(p, pLine); CLine line(p, len); @@ -1990,7 +1988,9 @@ ++iter; if (iter == m_DataList.end()) { if (reslen > 10000) { - m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); + if (m_pControlSocket) { + m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); + } error = true; return 0; } @@ -2004,7 +2004,9 @@ } if (reslen > 10000) { - m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); + if (m_pControlSocket) { + m_pControlSocket->LogMessage(MessageType::Error, _("Received a line exceeding 10000 characters, aborting.")); + } error = true; return 0; } @@ -2049,22 +2051,21 @@ m_DataList.erase(m_DataList.begin(), iter); size_t lineLength{}; - wxChar* buffer; + wchar_t* buffer; if (m_pControlSocket) { buffer = m_pControlSocket->ConvToLocalBuffer(res, buflen, lineLength); m_pControlSocket->LogMessageRaw(MessageType::RawList, buffer); } else { wxString str(res, wxConvUTF8); - if (str.empty()) - { + if (str.empty()) { str = wxString(res, wxConvLocal); if (str.empty()) str = wxString(res, wxConvISO8859_1); } lineLength = str.Len() + 1; - buffer = new wxChar[str.Len() + 1]; - wxStrcpy(buffer, str.c_str()); + buffer = new wchar_t[str.Len() + 1]; + wcscpy(buffer, str.c_str()); } delete [] res; @@ -2122,7 +2123,7 @@ if (!ParseTime(token, entry)) return false; - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; entry.time += m_timezoneOffset; @@ -2157,11 +2158,11 @@ return false; entry.name = token.GetString(); - if (entry.name.find(' ') != fzstring::npos) + if (entry.name.find(' ') != std::wstring::npos) return false; entry.size = -1; - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; return true; @@ -2220,7 +2221,7 @@ entry.name = token.GetString(); - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; return true; @@ -2283,7 +2284,7 @@ if (!line.GetToken(index++, token, true)) return false; - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; entry.time += m_timezoneOffset; @@ -2300,8 +2301,7 @@ if (!line.GetToken(index, token)) return false; - wxString s = token.GetString(); - MakeLowerAscii(s); + std::wstring s = fz::str_tolower_ascii(token.GetString()); if (s != _T("migrated")) return false; @@ -2315,7 +2315,7 @@ entry.flags = 0; entry.size = -1; - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; return true; @@ -2331,7 +2331,7 @@ entry.name = token.GetString(); entry.flags = 0; - entry.ownerGroup = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); entry.permissions = entry.ownerGroup; entry.size = -1; @@ -2400,8 +2400,7 @@ if (!line.GetToken(index++, token)) return false; - wxString s = token.GetString(); - MakeLowerAscii(s); + std::wstring s = fz::str_tolower_ascii(token.GetString()); if (s != _T("tape")) return false; @@ -2411,8 +2410,8 @@ entry.name = token.GetString(); entry.flags = 0; - entry.ownerGroup = objcache.get(fzstring()); - entry.permissions = objcache.get(fzstring()); + entry.ownerGroup = objcache.get(std::wstring()); + entry.permissions = objcache.get(std::wstring()); entry.size = -1; if (line.GetToken(index++, token)) @@ -2522,21 +2521,21 @@ if (!line.GetToken(0, token)) return 0; - fzstring const facts = token.GetString(); + std::wstring const facts = token.GetString(); if (facts.empty()) return 0; entry.flags = 0; entry.size = -1; - fzstring owner, group, uid, gid; - fzstring ownerGroup; - fzstring permissions; + std::wstring owner, group, uid, gid; + std::wstring ownerGroup; + std::wstring permissions; size_t start = 0; while (start < facts.size()) { auto delim = facts.find(';', start); - if (delim == fzstring::npos) { + if (delim == std::wstring::npos) { delim = facts.size(); } else if (delim < start + 3) { @@ -2544,29 +2543,27 @@ } auto const pos = facts.find('=', start); - if (pos == fzstring::npos || pos < start + 1 || pos > delim) + if (pos == std::wstring::npos || pos < start + 1 || pos > delim) return 0; - fzstring factname = facts.substr(start, pos - start); - MakeLowerAscii(factname); - fzstring value = facts.substr(pos + 1, delim - pos - 1); + 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")) { auto colonPos = value.find(':'); - fzstring valuePrefix; - if (colonPos == fzstring::npos) - valuePrefix = value; + std::wstring valuePrefix; + if (colonPos == std::wstring::npos) + valuePrefix = fz::str_tolower_ascii(value); else - valuePrefix = value.substr(0, colonPos); - MakeLowerAscii(valuePrefix); + valuePrefix = fz::str_tolower_ascii(value.substr(0, colonPos)); - if (valuePrefix == _T("dir") && colonPos == fzstring::npos) + if (valuePrefix == _T("dir") && colonPos == std::wstring::npos) entry.flags |= CDirentry::flag_dir; else if (valuePrefix == _T("os.unix=slink") || valuePrefix == _T("os.unix=symlink")) { entry.flags |= CDirentry::flag_dir | CDirentry::flag_link; - if (colonPos != fzstring::npos) - entry.target = CSparseOptional(value.substr(colonPos)); + if (colonPos != std::wstring::npos) + entry.target = CSparseOptional(value.substr(colonPos)); } - else if ((valuePrefix == _T("cdir") || valuePrefix == _T("pdir")) && colonPos == fzstring::npos) { + else if ((valuePrefix == _T("cdir") || valuePrefix == _T("pdir")) && colonPos == std::wstring::npos) { // Current and parent directory, don't parse it return 2; } @@ -2584,8 +2581,8 @@ else if (factname == _T("modify") || (!entry.has_date() && factname == _T("create"))) { - entry.time = CDateTime(value, CDateTime::utc); - if (!entry.time.IsValid()) { + entry.time = fz::datetime(value, fz::datetime::utc); + if (!entry.time.empty()) { return 0; } } @@ -2737,7 +2734,7 @@ // File format. Unused if (!line.GetToken(++index, token)) return false; - wxString format = token.GetString(); + std::wstring format = token.GetString(); if (format != _T("V") && format != _T("F")) return false; @@ -2792,7 +2789,7 @@ return false; entry.ownerGroup = objcache.get(ownerGroupToken.GetString()); - entry.permissions = objcache.get(fzstring()); + entry.permissions = objcache.get(std::wstring()); entry.target.clear(); entry.time += m_timezoneOffset; @@ -2841,7 +2838,7 @@ // Owner if (!line.GetToken(++index, token)) return false; - fzstring ownerGroup = token.GetString(); + std::wstring ownerGroup = token.GetString(); if (token[token.GetLength() - 1] == ',') { // Owner, part 2 @@ -2865,17 +2862,12 @@ return true; } -bool CDirectoryListingParser::GetMonthFromName(const wxString& name, int &month) +bool CDirectoryListingParser::GetMonthFromName(const std::wstring& name, int &month) { - auto iter = m_MonthNamesMap.find(name.Lower()); + std::wstring lower = fz::str_tolower_ascii(name); + auto iter = m_MonthNamesMap.find(lower); if (iter == m_MonthNamesMap.end()) - { - wxString lower(name); - MakeLowerAscii(lower); - iter = m_MonthNamesMap.find(lower); - if (iter == m_MonthNamesMap.end()) - return false; - } + return false; month = iter->second; @@ -2927,42 +2919,43 @@ int count_normal = 0; int count_ebcdic = 0; - for (int i = '0'; i <= '9'; ++i ) { + for (int i = '0'; i <= '9'; ++i) { count_normal += count[i]; } - for (int i = 'a'; i <= 'z'; ++i ) { + for (int i = 'a'; i <= 'z'; ++i) { count_normal += count[i]; } - for (int i = 'A'; i <= 'Z'; ++i ) { + for (int i = 'A'; i <= 'Z'; ++i) { count_normal += count[i]; } - for (int i = 0x81; i <= 0x89; ++i ) { + for (int i = 0x81; i <= 0x89; ++i) { count_ebcdic += count[i]; } - for (int i = 0x91; i <= 0x99; ++i ) { + for (int i = 0x91; i <= 0x99; ++i) { count_ebcdic += count[i]; } - for (int i = 0xa2; i <= 0xa9; ++i ) { + for (int i = 0xa2; i <= 0xa9; ++i) { count_ebcdic += count[i]; } - for (int i = 0xc1; i <= 0xc9; ++i ) { + for (int i = 0xc1; i <= 0xc9; ++i) { count_ebcdic += count[i]; } - for (int i = 0xd1; i <= 0xd9; ++i ) { + for (int i = 0xd1; i <= 0xd9; ++i) { count_ebcdic += count[i]; } - for (int i = 0xe2; i <= 0xe9; ++i ) { + for (int i = 0xe2; i <= 0xe9; ++i) { count_ebcdic += count[i]; } - for (int i = 0xf0; i <= 0xf9; ++i ) { + for (int i = 0xf0; i <= 0xf9; ++i) { count_ebcdic += count[i]; } - if ((count[0x1f] || count[0x15] || count[0x25]) && !count[0x0a] && count[static_cast('@')] && count[static_cast('@')] > count[static_cast(' ')] && count_ebcdic > count_normal) - { - m_pControlSocket->LogMessage(MessageType::Status, _("Received a directory listing which appears to be encoded in EBCDIC.")); + if ((count[0x1f] || count[0x15] || count[0x25]) && !count[0x0a] && count[static_cast('@')] && count[static_cast('@')] > count[static_cast(' ')] && count_ebcdic > count_normal) { + if (m_pControlSocket) { + 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); diff -Nru filezilla-3.14.1/src/engine/directorylistingparser.h filezilla-3.15.0.2/src/engine/directorylistingparser.h --- filezilla-3.14.1/src/engine/directorylistingparser.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/directorylistingparser.h 2016-02-05 08:54:46.000000000 +0000 @@ -59,11 +59,11 @@ CDirectoryListing Parse(const CServerPath &path); bool AddData(char *pData, int len); - bool AddLine(const wxChar* pLine); + bool AddLine(const wchar_t* pLine); void Reset(); - void SetTimezoneOffset(duration const& span) { m_timezoneOffset = span; } + void SetTimezoneOffset(fz::duration const& span) { m_timezoneOffset = span; } void SetServer(const CServer& server) { m_server = server; }; @@ -105,14 +105,14 @@ // Parse file sizes given like this: 123.4M bool ParseComplexFileSize(CToken& token, int64_t& size, int blocksize = -1); - bool GetMonthFromName(const wxString& name, int &month); + bool GetMonthFromName(std::wstring const& name, int &month); void DeduceEncoding(); void ConvertEncoding(char *pData, int len); CControlSocket* m_pControlSocket; - static std::map m_MonthNamesMap; + static std::map m_MonthNamesMap; struct t_list { @@ -140,7 +140,7 @@ bool m_maybeMultilineVms; - duration m_timezoneOffset; + fz::duration m_timezoneOffset; listingEncoding::type m_listingEncoding; diff -Nru filezilla-3.14.1/src/engine/engine_context.cpp filezilla-3.15.0.2/src/engine/engine_context.cpp --- filezilla-3.14.1/src/engine/engine_context.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/engine_context.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -2,37 +2,38 @@ #include "engine_context.h" #include "directorycache.h" -#include "event_loop.h" #include "logging_private.h" #include "pathcache.h" #include "ratelimiter.h" #include "socket.h" +#include + namespace { struct logging_options_changed_event_type; -typedef CEvent CLoggingOptionsChangedEvent; +typedef fz::simple_event CLoggingOptionsChangedEvent; -class CLoggingOptionsChanged final : public CEventHandler, COptionChangeEventHandler +class CLoggingOptionsChanged final : public fz::event_handler, COptionChangeEventHandler { public: - CLoggingOptionsChanged(COptionsBase& options, CEventLoop & loop) - : CEventHandler(loop) + CLoggingOptionsChanged(COptionsBase& options, fz::event_loop & loop) + : fz::event_handler(loop) , options_(options) { RegisterOption(OPTION_LOGGING_DEBUGLEVEL); RegisterOption(OPTION_LOGGING_RAWLISTING); - SendEvent(); + send_event(); } virtual void OnOptionsChanged(changed_options_t const& options) { if (options.test(OPTION_LOGGING_DEBUGLEVEL) || options.test(OPTION_LOGGING_RAWLISTING)) { CLogging::UpdateLogLevel(options_); // In main thread - SendEvent(); + send_event(); } } - virtual void operator()(const CEventBase&) + virtual void operator()(const fz::event_base&) { CLogging::UpdateLogLevel(options_); // In worker thread } @@ -53,10 +54,10 @@ ~Impl() { - optionChangeHandler_.RemoveHandler(); + optionChangeHandler_.remove_handler(); } - CEventLoop loop_; + fz::event_loop loop_; CRateLimiter limiter_; CDirectoryCache directory_cache_; CPathCache path_cache_; @@ -78,7 +79,7 @@ return options_; } -CEventLoop& CFileZillaEngineContext::GetEventLoop() +fz::event_loop& CFileZillaEngineContext::GetEventLoop() { return impl_->loop_; } diff -Nru filezilla-3.14.1/src/engine/engineprivate.cpp filezilla-3.15.0.2/src/engine/engineprivate.cpp --- filezilla-3.14.1/src/engine/engineprivate.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/engineprivate.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -2,7 +2,6 @@ #include "ControlSocket.h" #include "directorycache.h" #include "engineprivate.h" -#include "event_loop.h" #include "ftpcontrolsocket.h" #include "httpcontrolsocket.h" #include "logging_private.h" @@ -10,15 +9,17 @@ #include "ratelimiter.h" #include "sftpcontrolsocket.h" +#include + #include -mutex CFileZillaEnginePrivate::mutex_; +fz::mutex CFileZillaEnginePrivate::mutex_; 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) - : CEventHandler(context.GetEventLoop()) + : event_handler(context.GetEventLoop()) , transfer_status_(*this) , m_options(context.GetOptions()) , m_rateLimiter(context.GetRateLimiter()) @@ -29,7 +30,7 @@ m_engineList.push_back(this); { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); static int id = 0; m_engine_id = ++id; } @@ -38,7 +39,7 @@ { bool queue_logs = ShouldQueueLogsFromOptions(); - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); queue_logs_ = queue_logs; } @@ -57,7 +58,7 @@ CFileZillaEnginePrivate::~CFileZillaEnginePrivate() { - RemoveHandler(); + remove_handler(); m_maySendNotificationEvent = false; m_pControlSocket.reset(); @@ -100,13 +101,13 @@ bool CFileZillaEnginePrivate::IsBusy() const { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); return m_pCurrentCommand != 0; } bool CFileZillaEnginePrivate::IsConnected() const { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!m_pControlSocket) return false; @@ -115,13 +116,13 @@ const CCommand *CFileZillaEnginePrivate::GetCurrentCommand() const { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); return m_pCurrentCommand.get(); } Command CFileZillaEnginePrivate::GetCurrentCommandId() const { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!m_pCurrentCommand) return Command::none; else @@ -131,7 +132,7 @@ void CFileZillaEnginePrivate::AddNotification(CNotification *pNotification) { { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); m_NotificationList.push_back(pNotification); if (!m_maySendNotificationEvent || !m_pEventHandler) { @@ -145,7 +146,7 @@ void CFileZillaEnginePrivate::AddLogNotification(CLogmsgNotification *pNotification) { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); if (pNotification->msgType == MessageType::Error) { queue_logs_ = false; @@ -167,7 +168,7 @@ void CFileZillaEnginePrivate::SendQueuedLogs(bool reset_flag) { { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); m_NotificationList.insert(m_NotificationList.end(), queued_logs_.begin(), queued_logs_.end()); queued_logs_.clear(); @@ -186,7 +187,7 @@ void CFileZillaEnginePrivate::ClearQueuedLogs(bool reset_flag) { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); for (auto msg : queued_logs_) { delete msg; @@ -200,7 +201,7 @@ int CFileZillaEnginePrivate::ResetOperation(int nErrorCode) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); m_pLogging->LogMessage(MessageType::Debug_Debug, _T("CFileZillaEnginePrivate::ResetOperation(%d)"), nErrorCode); if (nErrorCode & FZ_REPLY_DISCONNECTED) @@ -226,8 +227,8 @@ if (!delay) delay = 1; m_pLogging->LogMessage(MessageType::Status, _("Waiting to retry...")); - StopTimer(m_retryTimer); - m_retryTimer = AddTimer(duration::from_milliseconds(delay), true); + stop_timer(m_retryTimer); + m_retryTimer = add_timer(fz::duration::from_milliseconds(delay), true); return FZ_REPLY_WOULDBLOCK; } } @@ -266,7 +267,7 @@ unsigned int CFileZillaEnginePrivate::GetNextAsyncRequestNumber() { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); return ++m_asyncRequestCounter; } @@ -326,7 +327,7 @@ else { if (!avoid) { m_lastListDir = pListing->path; - m_lastListTime = CMonotonicClock::now(); + m_lastListTime = fz::monotonic_clock::now(); CDirectoryListingNotification *pNotification = new CDirectoryListingNotification(pListing->path); AddNotification(pNotification); } @@ -352,7 +353,7 @@ int CFileZillaEnginePrivate::RawCommand(const CRawCommand& command) { { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); queue_logs_ = false; } return m_pControlSocket->RawCommand(command.GetCommand()); @@ -391,7 +392,7 @@ void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); wxASSERT(m_pControlSocket); @@ -402,13 +403,13 @@ if (failed) { AddNotification(new CDirectoryListingNotification(path, false, true)); - m_lastListTime = CMonotonicClock::now(); + m_lastListTime = fz::monotonic_clock::now(); // On failed messages, we don't notify other engines return; } - CMonotonicClock changeTime; + fz::monotonic_clock changeTime; if (!directory_cache_.GetChangeTime(changeTime, *pOwnServer, path)) return; @@ -442,10 +443,10 @@ void CFileZillaEnginePrivate::RegisterFailedLoginAttempt(const CServer& server, bool critical) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); std::list::iterator iter = m_failedLogins.begin(); while (iter != m_failedLogins.end()) { - duration const span = CDateTime::Now() - iter->time; + fz::duration const span = fz::datetime::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()))) { @@ -459,17 +460,17 @@ t_failedLogins failure; failure.server = server; - failure.time = CDateTime::Now(); + failure.time = fz::datetime::now(); failure.critical = critical; m_failedLogins.push_back(failure); } unsigned int CFileZillaEnginePrivate::GetRemainingReconnectDelay(const CServer& server) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); std::list::iterator iter = m_failedLogins.begin(); while (iter != m_failedLogins.end()) { - duration const span = CDateTime::Now() - iter->time; + fz::duration const span = fz::datetime::now() - iter->time; const int delay = m_options.GetOptionVal(OPTION_RECONNECTDELAY); if (span.get_seconds() >= delay) { std::list::iterator prev = iter; @@ -507,7 +508,7 @@ int CFileZillaEnginePrivate::ContinueConnect() { - scoped_lock lock(mutex_); + 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")); @@ -519,8 +520,8 @@ unsigned int 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); - StopTimer(m_retryTimer); - m_retryTimer = AddTimer(duration::from_milliseconds(delay), true); + stop_timer(m_retryTimer); + m_retryTimer = add_timer(fz::duration::from_milliseconds(delay), true); return FZ_REPLY_WOULDBLOCK; } @@ -553,7 +554,7 @@ void CFileZillaEnginePrivate::InvalidateCurrentWorkingDirs(const CServerPath& path) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); wxASSERT(m_pControlSocket); const CServer* const pOwnServer = m_pControlSocket->GetCurrentServer(); @@ -574,11 +575,11 @@ } } -void CFileZillaEnginePrivate::operator()(CEventBase const& ev) +void CFileZillaEnginePrivate::operator()(fz::event_base const& ev) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); - Dispatch(ev, this, + fz::dispatch(ev, this, &CFileZillaEnginePrivate::OnEngineEvent, &CFileZillaEnginePrivate::OnCommandEvent, &CFileZillaEnginePrivate::OnSetAsyncRequestReplyEvent, @@ -605,7 +606,7 @@ void CFileZillaEnginePrivate::OnCommandEvent() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (m_pCurrentCommand) { CCommand & command = *m_pCurrentCommand; @@ -663,7 +664,7 @@ void CFileZillaEnginePrivate::DoCancel() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!IsBusy()) return; @@ -674,7 +675,7 @@ m_pCurrentCommand.reset(); - StopTimer(m_retryTimer); + stop_timer(m_retryTimer); m_retryTimer = 0; m_pLogging->LogMessage(MessageType::Error, _("Connection attempt interrupted by user")); @@ -702,7 +703,7 @@ bool match; { - scoped_lock l(notification_mutex_); + fz::scoped_lock l(notification_mutex_); match = reply->requestNumber == m_asyncRequestCounter; } @@ -711,7 +712,7 @@ void CFileZillaEnginePrivate::OnSetAsyncRequestReplyEvent(std::unique_ptr const& reply) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!CheckAsyncRequestReplyPreconditions(reply)) { return; } @@ -722,14 +723,14 @@ int CFileZillaEnginePrivate::Init(wxEvtHandler *pEventHandler) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); m_pEventHandler = pEventHandler; return FZ_REPLY_OK; } int CFileZillaEnginePrivate::Execute(const CCommand &command) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); int res = CheckCommandPreconditions(command, true); if (res != FZ_REPLY_OK) { @@ -737,14 +738,14 @@ } m_pCurrentCommand.reset(command.Clone()); - SendEvent(); + send_event(); return FZ_REPLY_WOULDBLOCK; } std::unique_ptr CFileZillaEnginePrivate::GetNextNotification() { - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); if (m_NotificationList.empty()) { m_maySendNotificationEvent = true; @@ -758,12 +759,12 @@ bool CFileZillaEnginePrivate::SetAsyncRequestReply(std::unique_ptr && pNotification) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!CheckAsyncRequestReplyPreconditions(pNotification)) { return false; } - SendEvent(std::move(pNotification)); + send_event(std::move(pNotification)); return true; } @@ -776,7 +777,7 @@ if (!IsBusy()) return false; - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); return pNotification->requestNumber == m_asyncRequestCounter; } @@ -808,7 +809,7 @@ int CFileZillaEnginePrivate::CacheLookup(const CServerPath& path, CDirectoryListing& listing) { // TODO: Possible optimization: Atomically get current server. The cache has its own mutex. - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!IsConnected()) return FZ_REPLY_ERROR; @@ -824,18 +825,18 @@ int CFileZillaEnginePrivate::Cancel() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!IsBusy()) return FZ_REPLY_OK; - SendEvent(engineCancel); + send_event(engineCancel); return FZ_REPLY_WOULDBLOCK; } void CFileZillaEnginePrivate::OnOptionsChanged(changed_options_t const&) { bool queue_logs = ShouldQueueLogsFromOptions(); - scoped_lock lock(notification_mutex_); + fz::scoped_lock lock(notification_mutex_); queue_logs_ = queue_logs; if (!queue_logs_) { @@ -852,7 +853,7 @@ void CTransferStatusManager::Reset() { { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); status_.clear(); send_state_ = 0; } @@ -862,7 +863,7 @@ void CTransferStatusManager::Init(wxFileOffset totalSize, wxFileOffset startOffset, bool list) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (startOffset < 0) startOffset = 0; @@ -872,16 +873,16 @@ void CTransferStatusManager::SetStartTime() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!status_) return; - status_.started = CDateTime::Now(); + status_.started = fz::datetime::now(); } void CTransferStatusManager::SetMadeProgress() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!status_) return; @@ -895,7 +896,7 @@ { int64_t oldOffset = currentOffset_.fetch_add(transferredBytes); if (!oldOffset) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!status_) { return; } @@ -915,7 +916,7 @@ CTransferStatus CTransferStatusManager::Get(bool &changed) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); if (!status_) { changed = false; send_state_ = 0; @@ -936,6 +937,6 @@ bool CTransferStatusManager::empty() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); return status_.empty(); } diff -Nru filezilla-3.14.1/src/engine/engineprivate.h filezilla-3.15.0.2/src/engine/engineprivate.h --- filezilla-3.14.1/src/engine/engineprivate.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/engineprivate.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,13 +1,13 @@ #ifndef __FILEZILLAENGINEPRIVATE_H__ #define __FILEZILLAENGINEPRIVATE_H__ -#include "timeex.h" +#include +#include +#include +#include #include "engine_context.h" -#include "event.h" -#include "event_handler.h" #include "FileZillaEngine.h" -#include "mutex.h" #include "option_change_event_handler.h" #include @@ -23,7 +23,7 @@ }; struct filezilla_engine_event_type; -typedef CEvent CFileZillaEngineEvent; +typedef fz::simple_event CFileZillaEngineEvent; class CTransferStatusManager final { @@ -44,7 +44,7 @@ CTransferStatus Get(bool &changed); protected: - mutex mutex_; + fz::mutex mutex_; CTransferStatus status_; std::atomic currentOffset_{}; @@ -53,7 +53,7 @@ CFileZillaEnginePrivate& engine_; }; -class CFileZillaEnginePrivate final : public CEventHandler, COptionChangeEventHandler +class CFileZillaEnginePrivate final : public fz::event_handler, COptionChangeEventHandler { public: CFileZillaEnginePrivate(CFileZillaEngineContext& engine_context, CFileZillaEngine& parent); @@ -135,17 +135,17 @@ int ContinueConnect(); - void operator()(CEventBase const& ev); + void operator()(fz::event_base const& ev); void OnEngineEvent(EngineNotificationType type); void OnTimer(int timer_id); void OnCommandEvent(); // General mutex for operations on the engine // Todo: More fine-grained locking, a global mutex isn't nice - static mutex mutex_; + static fz::mutex mutex_; // Used to synchronize access to the notification list - mutex notification_mutex_; + fz::mutex notification_mutex_; wxEvtHandler *m_pEventHandler{}; @@ -158,7 +158,7 @@ // Remember last path used in a dirlisting. CServerPath m_lastListDir; - CMonotonicClock m_lastListTime; + fz::monotonic_clock m_lastListTime; std::unique_ptr m_pControlSocket; @@ -187,12 +187,12 @@ struct t_failedLogins final { CServer server; - CDateTime time; + fz::datetime time; bool critical{}; }; static std::list m_failedLogins; int m_retryCount{}; - timer_id m_retryTimer{}; + fz::timer_id m_retryTimer{}; CRateLimiter& m_rateLimiter; CDirectoryCache& directory_cache_; @@ -205,9 +205,9 @@ }; struct command_event_type{}; -typedef CEvent CCommandEvent; +typedef fz::simple_event CCommandEvent; struct async_request_reply_event_type{}; -typedef CEvent> CAsyncRequestReplyEvent; +typedef fz::simple_event> CAsyncRequestReplyEvent; #endif //__FILEZILLAENGINEPRIVATE_H__ diff -Nru filezilla-3.14.1/src/engine/engine.vcxproj filezilla-3.15.0.2/src/engine/engine.vcxproj --- filezilla-3.14.1/src/engine/engine.vcxproj 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/engine.vcxproj 2016-02-05 08:54:46.000000000 +0000 @@ -80,27 +80,23 @@ - - - Create - - - - + + + @@ -111,19 +107,12 @@ - - - - - - - @@ -135,11 +124,9 @@ - - - + @@ -157,7 +144,6 @@ - diff -Nru filezilla-3.14.1/src/engine/event_handler.cpp filezilla-3.15.0.2/src/engine/event_handler.cpp --- filezilla-3.14.1/src/engine/event_handler.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/event_handler.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#include - -#include "event_handler.h" -#include "event_loop.h" - -CEventHandler::CEventHandler(CEventLoop& loop) - : event_loop_(loop) -{ -} - -CEventHandler::~CEventHandler() -{ - wxASSERT(removing_); // To avoid races, the base class must have removed us already -} - -void CEventHandler::RemoveHandler() -{ - event_loop_.RemoveHandler(this); -} - -timer_id CEventHandler::AddTimer(duration const& interval, bool one_shot) -{ - return event_loop_.AddTimer(this, interval, one_shot); -} - -void CEventHandler::StopTimer(timer_id id) -{ - event_loop_.StopTimer(id); -} diff -Nru filezilla-3.14.1/src/engine/event_loop.cpp filezilla-3.15.0.2/src/engine/event_loop.cpp --- filezilla-3.14.1/src/engine/event_loop.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/event_loop.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ -#include - -#include "event_loop.h" - -#include - -CEventLoop::CEventLoop() - : wxThread(wxTHREAD_JOINABLE) - , sync_(false) -{ - Create(); - Run(); -} - -CEventLoop::~CEventLoop() -{ - { - scoped_lock lock(sync_); - quit_ = true; - cond_.signal(lock); - } - - Wait(wxTHREAD_WAIT_BLOCK); - - scoped_lock lock(sync_); - for (auto & v : pending_events_) { - delete v.second; - } -} - -void CEventLoop::SendEvent(CEventHandler* handler, CEventBase* evt) -{ - { - scoped_lock lock(sync_); - if (!handler->removing_) { - if (pending_events_.empty()) { - cond_.signal(lock); - } - pending_events_.emplace_back(handler, evt); - return; - } - } - - delete evt; -} - -void CEventLoop::RemoveHandler(CEventHandler* handler) -{ - scoped_lock l(sync_); - - handler->removing_ = true; - - pending_events_.erase( - std::remove_if(pending_events_.begin(), pending_events_.end(), - [&](Events::value_type const& v) { - if (v.first == handler) { - delete v.second; - } - return v.first == handler; - } - ), - pending_events_.end() - ); - - timers_.erase( - std::remove_if(timers_.begin(), timers_.end(), - [&](timer_data const& v) { - return v.handler_ == handler; - } - ), - timers_.end() - ); - if (timers_.empty()) { - deadline_ = CMonotonicClock(); - } - - while (active_handler_ == handler) { - l.unlock(); - wxMilliSleep(1); - l.lock(); - } -} - -void CEventLoop::FilterEvents(std::function const& filter) -{ - scoped_lock l(sync_); - - pending_events_.erase( - std::remove_if(pending_events_.begin(), pending_events_.end(), - [&](Events::value_type & v) { - bool const remove = filter(v); - if (remove) { - delete v.second; - } - return remove; - } - ), - pending_events_.end() - ); -} - -timer_id CEventLoop::AddTimer(CEventHandler* handler, duration const& interval, bool one_shot) -{ - timer_data d; - d.handler_ = handler; - if (!one_shot) { - d.interval_ = interval; - } - d.deadline_ = CMonotonicClock::now() + interval; - - scoped_lock lock(sync_); - if (!handler->removing_) { - d.id_ = ++next_timer_id_; // 64bit, can this really ever overflow? - - timers_.emplace_back(d); - if (!deadline_ || d.deadline_ < deadline_) { - // Our new time is the next timer to trigger - deadline_ = d.deadline_; - cond_.signal(lock); - } - } - return d.id_; -} - -void CEventLoop::StopTimer(timer_id id) -{ - if (id) { - scoped_lock lock(sync_); - for (auto it = timers_.begin(); it != timers_.end(); ++it) { - if (it->id_ == id) { - timers_.erase(it); - if (timers_.empty()) { - deadline_ = CMonotonicClock(); - } - break; - } - } - } -} - -bool CEventLoop::ProcessEvent(scoped_lock & l) -{ - Events::value_type ev{}; - - if (pending_events_.empty()) { - return false; - } - ev = pending_events_.front(); - pending_events_.pop_front(); - - wxASSERT(ev.first); - wxASSERT(ev.second); - wxASSERT(!ev.first->removing_); - - active_handler_ = ev.first; - - l.unlock(); - (*ev.first)(*ev.second); - delete ev.second; - l.lock(); - - active_handler_ = 0; - - return true; -} - -wxThread::ExitCode CEventLoop::Entry() -{ - scoped_lock l(sync_); - while (!quit_) { - CMonotonicClock const now(CMonotonicClock::now()); - if (ProcessTimers(l, now)) { - continue; - } - if (ProcessEvent(l)) { - continue; - } - - // Nothing to do, now we wait - if (deadline_) { - int wait = static_cast((deadline_ - now).get_milliseconds()); - cond_.wait(l, wait); - } - else { - cond_.wait(l); - } - } - - return 0; -} - -bool CEventLoop::ProcessTimers(scoped_lock & l, CMonotonicClock const& now) -{ - if (!deadline_ || now < deadline_) { - // There's no deadline or deadline has not yet expired - return false; - } - - // Update deadline_, stop at first expired timer - deadline_ = CMonotonicClock(); - auto it = timers_.begin(); - for (; it != timers_.end(); ++it) { - if (!deadline_ || it->deadline_ < deadline_) { - if (it->deadline_ <= now) { - break; - } - deadline_ = it->deadline_; - } - } - - if (it != timers_.end()) { - // 'it' is now expired - // deadline_ has been updated with prior timers - // go through remaining elements to update deadline_ - for (auto it2 = std::next(it); it2 != timers_.end(); ++it2) { - if (!deadline_ || it2->deadline_ < deadline_) { - deadline_ = it2->deadline_; - } - } - - CEventHandler *const handler = it->handler_; - auto const id = it->id_; - - // Update the expired timer - if (!it->interval_) { - timers_.erase(it); - } - else { - it->deadline_ = std::move(now + it->interval_); - if (!deadline_ || it->deadline_ < deadline_) { - deadline_ = it->deadline_; - } - } - - // Call event handler - wxASSERT(!handler->removing_); - - active_handler_ = handler; - - l.unlock(); - (*handler)(CTimerEvent(id)); - l.lock(); - - active_handler_ = 0; - - return true; - } - - return false; -} diff -Nru filezilla-3.14.1/src/engine/externalipresolver.cpp filezilla-3.15.0.2/src/engine/externalipresolver.cpp --- filezilla-3.14.1/src/engine/externalipresolver.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/externalipresolver.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -3,16 +3,18 @@ #include "socket.h" #include "misc.h" +#include + #include namespace { -mutex s_sync; +fz::mutex s_sync; wxString ip; bool checked = false; } -CExternalIPResolver::CExternalIPResolver(CEventHandler & handler) - : CEventHandler(handler.event_loop_) +CExternalIPResolver::CExternalIPResolver(event_handler & handler) + : event_handler(handler.event_loop_) , m_handler(&handler) { ResetHttpData(true); @@ -20,6 +22,8 @@ CExternalIPResolver::~CExternalIPResolver() { + remove_handler(); + delete [] m_pSendBuffer; m_pSendBuffer = 0; delete [] m_pRecvBuffer; @@ -32,7 +36,7 @@ void CExternalIPResolver::GetExternalIP(const wxString& address, CSocket::address_family protocol, bool force /*=false*/) { { - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); if (checked) { if (force) checked = false; @@ -85,9 +89,9 @@ strcpy(m_pSendBuffer, buffer.mb_str()); } -void CExternalIPResolver::operator()(CEventBase const& ev) +void CExternalIPResolver::operator()(fz::event_base const& ev) { - Dispatch(ev, this, &CExternalIPResolver::OnSocketEvent); + fz::dispatch(ev, this, &CExternalIPResolver::OnSocketEvent); } void CExternalIPResolver::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) @@ -218,7 +222,7 @@ m_done = true; { - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); if (!successful) { ip.clear(); } @@ -226,7 +230,7 @@ } if (m_handler) { - m_handler->SendEvent(); + m_handler->send_event(); m_handler = 0; } } @@ -374,12 +378,12 @@ m_data = m_data.Mid(1); } - if (GetIPV6LongForm(m_data).empty()) { + if (fz::get_ipv6_long_form(m_data.ToStdWstring()).empty()) { Close(false); return; } - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); ip = m_data; } else { @@ -396,7 +400,7 @@ return; } - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); ip = regex.GetMatch(m_data, 2); } @@ -527,12 +531,12 @@ bool CExternalIPResolver::Successful() const { - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); return !ip.empty(); } wxString CExternalIPResolver::GetIP() const { - scoped_lock l(s_sync); + fz::scoped_lock l(s_sync); return ip; } diff -Nru filezilla-3.14.1/src/engine/file.cpp filezilla-3.15.0.2/src/engine/file.cpp --- filezilla-3.14.1/src/engine/file.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/file.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,231 +0,0 @@ -#include - -#include "file.h" - -CFile::CFile() -{ -} - -CFile::CFile(wxString const& f, mode m, disposition d) -{ - Open(f, m, d); -} - -CFile::~CFile() -{ - Close(); -} - -#ifdef __WXMSW__ -bool CFile::Open(wxString const& f, mode m, disposition d) -{ - Close(); - - DWORD dispositionFlags; - if (m == write) { - if (d == truncate) { - dispositionFlags = CREATE_ALWAYS; - } - else { - dispositionFlags = OPEN_ALWAYS; - } - } - else { - dispositionFlags = OPEN_EXISTING; - } - - DWORD shareMode = FILE_SHARE_READ; - if (m == read) { - shareMode |= FILE_SHARE_WRITE; - } - - hFile_ = CreateFile(f, (m == read) ? GENERIC_READ : GENERIC_WRITE, shareMode, 0, dispositionFlags, FILE_FLAG_SEQUENTIAL_SCAN, 0); - - return hFile_ != INVALID_HANDLE_VALUE; -} - -void CFile::Close() -{ - if (hFile_ != INVALID_HANDLE_VALUE) { - CloseHandle(hFile_); - hFile_ = INVALID_HANDLE_VALUE; - } -} - -wxFileOffset CFile::Length() const -{ - wxFileOffset ret = -1; - - LARGE_INTEGER size{}; - if (GetFileSizeEx(hFile_, &size)) { - ret = size.QuadPart; - } - return ret; -} - -wxFileOffset CFile::Seek(wxFileOffset offset, seekMode m) -{ - wxFileOffset ret = -1; - - LARGE_INTEGER dist{}; - dist.QuadPart = offset; - - DWORD method = FILE_BEGIN; - if (m == current) { - method = FILE_CURRENT; - } - else if (m == end) { - method = FILE_END; - } - - LARGE_INTEGER newPos{}; - if (SetFilePointerEx(hFile_, dist, &newPos, method)) { - ret = newPos.QuadPart; - } - return ret; -} - -bool CFile::Truncate() -{ - return !!SetEndOfFile(hFile_); -} - -ssize_t CFile::Read(void *buf, size_t count) -{ - ssize_t ret = -1; - - DWORD read = 0; - if (ReadFile(hFile_, buf, count, &read, 0)) { - ret = static_cast(read); - } - - return ret; -} - -ssize_t CFile::Write(void const* buf, size_t count) -{ - ssize_t ret = -1; - - DWORD written = 0; - if (WriteFile(hFile_, buf, count, &written, 0)) { - ret = static_cast(written); - } - - return ret; -} - -bool CFile::Opened() const -{ - return hFile_ != INVALID_HANDLE_VALUE; -} - -#else - -#include -#include - -bool CFile::Open(wxString const& f, mode m, disposition d) -{ - Close(); - - int flags = O_CLOEXEC; - if (m == read) { - flags |= O_RDONLY; - } - else { - flags |= O_WRONLY | O_CREAT; - if (d == truncate) { - flags |= O_TRUNC; - } - } - fd_ = open(f.fn_str(), flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); - -#if HAVE_POSIX_FADVISE - if (fd_ != -1) { - (void)posix_fadvise(fd_, 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE); - } -#endif - - return fd_ != -1; -} - -void CFile::Close() -{ - if (fd_ != -1) { - close(fd_); - fd_ = -1; - } -} - -wxFileOffset CFile::Length() const -{ - wxFileOffset ret = -1; - - struct stat buf; - if (!fstat(fd_, &buf)) { - ret = buf.st_size; - } - - return ret; -} - -wxFileOffset CFile::Seek(wxFileOffset offset, seekMode m) -{ - wxFileOffset ret = -1; - - int whence = SEEK_SET; - if (m == current) { - whence = SEEK_CUR; - } - else if (m == end) { - whence = SEEK_END; - } - - auto newPos = lseek(fd_, offset, whence); - if (newPos != static_cast(-1)) { - ret = newPos; - } - - return ret; -} - -bool CFile::Truncate() -{ - bool ret = false; - - auto length = lseek(fd_, 0, SEEK_CUR); - if (length != static_cast(-1)) { - do { - ret = !ftruncate(fd_, length); - } while (!ret && (errno == EAGAIN || errno == EINTR)); - } - - return ret; -} - -ssize_t CFile::Read(void *buf, size_t count) -{ - ssize_t ret; - do { - ret = ::read(fd_, buf, count); - } while (ret == -1 && (errno == EAGAIN || errno == EINTR)); - - return ret; -} - -ssize_t CFile::Write(void const* buf, size_t count) -{ - ssize_t ret; - do { - ret = ::write(fd_, buf, count); - } while (ret == -1 && (errno == EAGAIN || errno == EINTR)); - - return ret; -} - -bool CFile::Opened() const -{ - return fd_ != -1; -} - -#endif diff -Nru filezilla-3.14.1/src/engine/filezilla.h filezilla-3.15.0.2/src/engine/filezilla.h --- filezilla-3.14.1/src/engine/filezilla.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/filezilla.h 2016-02-05 08:54:46.000000000 +0000 @@ -1 +1 @@ -#include "libfilezilla.h" +#include "libfilezilla_engine.h" diff -Nru filezilla-3.14.1/src/engine/ftpcontrolsocket.cpp filezilla-3.15.0.2/src/engine/ftpcontrolsocket.cpp --- filezilla-3.14.1/src/engine/ftpcontrolsocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ftpcontrolsocket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -4,16 +4,19 @@ #include "directorylistingparser.h" #include "engineprivate.h" #include "externalipresolver.h" -#include "file.h" #include "ftpcontrolsocket.h" #include "iothread.h" #include "pathcache.h" #include "servercapabilities.h" #include "tlssocket.h" #include "transfersocket.h" -#include "local_filesys.h" #include "proxy.h" +#include +#include +#include +#include + #include #include #include @@ -154,9 +157,9 @@ std::deque files; bool omitPath{}; - // Set to CDateTime::Now initially and after + // Set to fz::datetime::Now initially and after // sending an updated listing to the UI. - CDateTime m_time; + fz::datetime m_time; bool m_needSendListing{}; @@ -189,7 +192,7 @@ CFtpControlSocket::~CFtpControlSocket() { - RemoveHandler(); + remove_handler(); m_pSocket->SetSynchronousReadCallback(0); DoClose(); @@ -903,7 +906,7 @@ ++pData->opState; if (pData->opState == LOGON_DONE) { - LogMessage(MessageType::Status, _("Connected")); + LogMessage(MessageType::Status, _("Logged in")); ResetOperation(FZ_REPLY_OK); LogMessage(MessageType::Debug_Info, _T("Measured latency of %d ms"), m_rtt.GetLatency()); return true; @@ -962,7 +965,7 @@ continue; capabilities cap = CServerCapabilities::GetCapability(*GetCurrentServer(), opst_mlst_command); if (cap == unknown) { - MakeLowerAscii(facts); + facts = fz::str_tolower_ascii(facts); bool had_unset = false; wxString opts_facts; @@ -1241,7 +1244,7 @@ // Listing index for list_mdtm int mdtm_index; - CMonotonicClock m_time_before_locking; + fz::monotonic_clock m_time_before_locking; }; enum listStates @@ -1355,7 +1358,7 @@ if (!pData->holdsLock) { if (!TryLockCache(lock_list, m_CurrentPath)) { pData->opState = list_waitlock; - pData->m_time_before_locking = CMonotonicClock::now(); + pData->m_time_before_locking = fz::monotonic_clock::now(); return FZ_REPLY_WOULDBLOCK; } } @@ -1445,7 +1448,7 @@ if (pData->tranferCommandSent && IsMisleadingListResponse()) { CDirectoryListing listing; listing.path = m_CurrentPath; - listing.m_firstListTime = CMonotonicClock::now(); + listing.m_firstListTime = fz::monotonic_clock::now(); if (pData->viewHiddenCheck) { if (pData->viewHidden) { @@ -1602,11 +1605,11 @@ if (CServerCapabilities::GetCapability(*m_pCurrentServer, timezone_offset) == unknown && m_Response.Left(4) == _T("213 ") && m_Response.Length() > 16) { - CDateTime date(m_Response.Mid(4), CDateTime::utc); - if (date.IsValid()) { + fz::datetime date(m_Response.Mid(4).ToStdWstring(), fz::datetime::utc); + if (date.empty()) { wxASSERT(pData->directoryListing[pData->mdtm_index].has_date()); - CDateTime listTime = pData->directoryListing[pData->mdtm_index].time; - listTime -= duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); + 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()) { @@ -1618,7 +1621,7 @@ LogMessage(MessageType::Status, _("Timezone offset of server is %d seconds."), -serveroffset); - duration span = duration::from_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]; @@ -1701,7 +1704,7 @@ pData->pIOThread = 0; int64_t size; bool isLink; - if (CLocalFileSystem::GetFileInfo(pData->localFile, isLink, &size, 0, 0) == CLocalFileSystem::file && size == 0) { + 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. @@ -1731,11 +1734,11 @@ } } - m_lastCommandCompletionTime = CMonotonicClock::now(); + m_lastCommandCompletionTime = fz::monotonic_clock::now(); if (m_pCurOpData && !(nErrorCode & FZ_REPLY_DISCONNECTED)) StartKeepaliveTimer(); else { - StopTimer(m_idleTimer); + stop_timer(m_idleTimer); m_idleTimer = 0; } @@ -2160,7 +2163,7 @@ int64_t size; bool isLink; - if (CLocalFileSystem::GetFileInfo(pData->localFile, isLink, &size, 0, 0) == CLocalFileSystem::file) + 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; @@ -2241,9 +2244,9 @@ case filetransfer_mdtm: pData->opState = filetransfer_resumetest; if (m_Response.Left(4) == _T("213 ") && m_Response.Length() > 16) { - pData->fileTime = CDateTime(m_Response.Mid(4), CDateTime::utc); - if (pData->fileTime.IsValid()) { - pData->fileTime += duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); + 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()); } } @@ -2395,17 +2398,17 @@ if (!pData->download && CServerCapabilities::GetCapability(*m_pCurrentServer, mfmt_command) == yes) { - CDateTime mtime = CLocalFileSystem::GetModificationTime(pData->localFile); - if (mtime.IsValid()) { + 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.IsValid()) { + else if (pData->download && pData->fileTime.empty()) { delete pData->pIOThread; pData->pIOThread = 0; - if (!CLocalFileSystem::SetModificationTime(pData->localFile, pData->fileTime)) + 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")); } } @@ -2475,7 +2478,7 @@ } { - auto pFile = std::make_unique(); + auto pFile = std::make_unique(); if (pData->download) { // Be quiet wxLogNull nullLog; @@ -2486,7 +2489,7 @@ bool didExist = wxFile::Exists(pData->localFile); if (pData->resume) { - if (!pFile->Open(pData->localFile, CFile::write, CFile::existing)) { + 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; @@ -2494,7 +2497,7 @@ pData->fileDidExist = didExist; - startOffset = pFile->Seek(0, CFile::end); + startOffset = pFile->seek(0, fz::file::end); if (startOffset == wxInvalidOffset) { LogMessage(MessageType::Error, _("Could not seek to the end of the file")); @@ -2518,7 +2521,7 @@ else { CreateLocalDir(pData->localFile); - if (!pFile->Open(pData->localFile, CFile::write, CFile::truncate)) { + 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; @@ -2537,22 +2540,22 @@ if (engine_.GetOptions().GetOptionVal(OPTION_PREALLOCATE_SPACE)) { // Try to preallocate the file in order to reduce fragmentation - wxFileOffset sizeToPreallocate = pData->remoteFileSize - startOffset; + 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); - wxFileOffset oldPos = pFile->Seek(0, CFile::current); + auto oldPos = pFile->seek(0, fz::file::current); if (oldPos >= 0) { - if (pFile->Seek(sizeToPreallocate, CFile::end) == pData->remoteFileSize) { - if (!pFile->Truncate()) + 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, CFile::begin); + pFile->seek(oldPos, fz::file::begin); } } } } else { - if (!pFile->Open(pData->localFile, CFile::read)) { + 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; @@ -2563,8 +2566,12 @@ if (pData->remoteFileSize > 0) { startOffset = pData->remoteFileSize; - if (pData->localFileSize < 0) - pData->localFileSize = pFile->Length(); + 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.")); @@ -2572,8 +2579,8 @@ if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS) && CServerCapabilities::GetCapability(*m_pCurrentServer, mfmt_command) == yes) { - CDateTime mtime = CLocalFileSystem::GetModificationTime(pData->localFile); - if (mtime.IsValid()) { + 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(); @@ -2584,7 +2591,7 @@ } // Assume native 64 bit type exists - if (pFile->Seek(startOffset, CFile::begin) == wxInvalidOffset) { + 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); @@ -2606,7 +2613,7 @@ pData->resumeOffset = 0; } - wxFileOffset len = pFile->Length(); + auto len = pFile->size(); engine_.transfer_status_.Init(len, startOffset, false); } pData->pIOThread = new CIOThread; @@ -2643,7 +2650,7 @@ case filetransfer_mfmt: { cmd = _T("MFMT "); - cmd += pData->fileTime.Format(_T("%Y%m%d%H%M%S "), CDateTime::utc); + cmd += pData->fileTime.format(_T("%Y%m%d%H%M%S "), fz::datetime::utc); cmd += pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath); break; @@ -2742,7 +2749,7 @@ int64_t size; bool isLink; - if (CLocalFileSystem::GetFileInfo(pData->localFile, isLink, &size, 0, 0) == CLocalFileSystem::file) + 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; @@ -2753,7 +2760,7 @@ else { pData->remoteFile = pFileExistsNotification->newName; pData->remoteFileSize = -1; - pData->fileTime = CDateTime(); + pData->fileTime = fz::datetime(); CDirentry entry; bool dir_did_exist; @@ -2970,8 +2977,8 @@ return FZ_REPLY_ERROR; } - if (!pData->m_time.IsValid()) - pData->m_time = CDateTime::Now(); + if (!pData->m_time.empty()) + pData->m_time = fz::datetime::now(); engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->path, file); @@ -3001,8 +3008,8 @@ engine_.GetDirectoryCache().RemoveFile(*m_pCurrentServer, pData->path, file); - CDateTime now = CDateTime::Now(); - if (now.IsValid() && pData->m_time.IsValid() && (now - pData->m_time).get_seconds() >= 1) { + 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; @@ -3703,7 +3710,7 @@ } const wxString peerIP = m_pSocket->GetPeerIP(); - if (!IsRoutableAddress(pData->host, m_pSocket->GetAddressFamily()) && IsRoutableAddress(peerIP, m_pSocket->GetAddressFamily())) { + 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); @@ -3734,7 +3741,7 @@ if (mode) { if (engine_.GetOptions().GetOptionVal(OPTION_NOEXTERNALONLOCAL) && - !IsRoutableAddress(m_pSocket->GetPeerIP(), m_pSocket->GetAddressFamily())) + !fz::is_routable_address(m_pSocket->GetPeerIP().ToStdWstring())) // Skip next block, use local address goto getLocalIP; } @@ -3946,22 +3953,38 @@ pData->opState = rawtransfer_transfer; break; case rawtransfer_transfer: - if (code != 1) { + 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; } - else - pData->opState = rawtransfer_waitfinish; break; case rawtransfer_waittransferpre: - if (code != 1) { + 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; } - else - pData->opState = rawtransfer_waittransfer; break; case rawtransfer_waitfinish: if (code != 2 && code != 3) { @@ -3978,10 +4001,8 @@ pData->pOldData->transferEndReason = TransferEndReason::transfer_command_failure; error = true; } - else - { - if (pData->pOldData->transferEndReason != TransferEndReason::successful) - { + else { + if (pData->pOldData->transferEndReason != TransferEndReason::successful) { error = true; break; } @@ -4270,13 +4291,13 @@ if (listing2.GetCount() > listing1.GetCount()) return false; - std::vector names1, names2; + 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; + std::vector::const_iterator iter1, iter2; iter1 = names1.cbegin(); iter2 = names2.cbegin(); while (iter2 != names2.cbegin()) { @@ -4295,7 +4316,7 @@ return true; } -void CFtpControlSocket::OnTimer(timer_id id) +void CFtpControlSocket::OnTimer(fz::timer_id id) { if (id != m_idleTimer) { CControlSocket::OnTimer(id); @@ -4311,7 +4332,7 @@ LogMessage(MessageType::Status, _("Sending keep-alive command")); wxString cmd; - int i = GetRandomNumber(0, 2); + int i = fz::random_number(0, 2); if (!i) cmd = _T("NOOP"); else if (i == 1) @@ -4340,13 +4361,13 @@ if (!m_lastCommandCompletionTime) return; - duration const span = CMonotonicClock::now() - m_lastCommandCompletionTime; + fz::duration const span = fz::monotonic_clock::now() - m_lastCommandCompletionTime; if (span.get_minutes() >= 30) { return; } - StopTimer(m_idleTimer); - m_idleTimer = AddTimer(duration::from_seconds(30), true); + stop_timer(m_idleTimer); + m_idleTimer = add_timer(fz::duration::from_seconds(30), true); } int CFtpControlSocket::ParseSubcommandResult(int prevResult) @@ -4384,13 +4405,13 @@ return FZ_REPLY_ERROR; } -void CFtpControlSocket::operator()(CEventBase const& ev) +void CFtpControlSocket::operator()(fz::event_base const& ev) { - if (Dispatch(ev, this, &CFtpControlSocket::OnTimer)) { + if (fz::dispatch(ev, this, &CFtpControlSocket::OnTimer)) { return; } - if (Dispatch(ev, this, &CFtpControlSocket::OnExternalIPAddress)) { + if (fz::dispatch(ev, this, &CFtpControlSocket::OnExternalIPAddress)) { return; } @@ -4415,6 +4436,5 @@ // EPSV is mandatory for IPv6, don't check capabilities ret = _T("EPSV"); } - return ret; } diff -Nru filezilla-3.14.1/src/engine/ftpcontrolsocket.h filezilla-3.15.0.2/src/engine/ftpcontrolsocket.h --- filezilla-3.14.1/src/engine/ftpcontrolsocket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ftpcontrolsocket.h 2016-02-10 19:27:09.000000000 +0000 @@ -148,16 +148,16 @@ // Used by keepalive code so that we're not using keep alive // till the end of time. Stop after a couple of minutes. - CMonotonicClock m_lastCommandCompletionTime; + fz::monotonic_clock m_lastCommandCompletionTime; - timer_id m_idleTimer{}; + fz::timer_id m_idleTimer{}; CLatencyMeasurement m_rtt; - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnExternalIPAddress(); - void OnTimer(timer_id id); + void OnTimer(fz::timer_id id); wxRegEx m_pasvReplyRegex; // Have it as class member to avoid recompiling the regex on each transfer or listing }; diff -Nru filezilla-3.14.1/src/engine/fzprocess.cpp filezilla-3.15.0.2/src/engine/fzprocess.cpp --- filezilla-3.14.1/src/engine/fzprocess.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/fzprocess.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,475 +0,0 @@ -#include -#include "fzprocess.h" - -#ifdef __WXMSW__ - -namespace { -void ResetHandle(HANDLE& handle) -{ - if (handle != INVALID_HANDLE_VALUE) { - CloseHandle(handle); - handle = INVALID_HANDLE_VALUE; - } -}; - -bool Uninherit(HANDLE& handle) -{ - if (handle != INVALID_HANDLE_VALUE) { - HANDLE newHandle = INVALID_HANDLE_VALUE; - - if (!DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &newHandle, 0, FALSE, DUPLICATE_SAME_ACCESS)) { - newHandle = INVALID_HANDLE_VALUE; - } - CloseHandle(handle); - handle = newHandle; - } - - return handle != INVALID_HANDLE_VALUE; -} - -class Pipe final -{ -public: - Pipe() = default; - - ~Pipe() - { - reset(); - } - - Pipe(Pipe const&) = delete; - Pipe& operator=(Pipe const&) = delete; - - bool Create(bool local_is_input) - { - reset(); - - SECURITY_ATTRIBUTES sa{}; - sa.bInheritHandle = TRUE; - sa.nLength = sizeof(sa); - - BOOL res = CreatePipe(&read_, &write_, &sa, 0); - if (res) { - // We only want one side of the pipe to be inheritable - if (!Uninherit(local_is_input ? read_ : write_)) { - reset(); - } - } - else { - read_ = INVALID_HANDLE_VALUE; - write_ = INVALID_HANDLE_VALUE; - } - return valid(); - } - - bool valid() const { - return read_ != INVALID_HANDLE_VALUE && write_ != INVALID_HANDLE_VALUE; - } - - void reset() - { - ResetHandle(read_); - ResetHandle(write_); - } - - HANDLE read_{INVALID_HANDLE_VALUE}; - HANDLE write_{INVALID_HANDLE_VALUE}; -}; -} - -class CProcess::Impl -{ -public: - Impl() = default; - ~Impl() - { - Kill(); - } - - Impl(Impl const&) = delete; - Impl& operator=(Impl const&) = delete; - - bool CreatePipes() - { - return - in_.Create(false) && - out_.Create(true) && - err_.Create(true); - } - - bool Execute(wxString const& cmd, std::vector const& args) - { - DWORD flags = CREATE_UNICODE_ENVIRONMENT | CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW; - - if (!CreatePipes()) { - return false; - } - - STARTUPINFO si{}; - si.cb = sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = in_.read_; - si.hStdOutput = out_.write_; - si.hStdError = err_.write_; - - auto cmdline = GetCmdLine(cmd, args); - - PROCESS_INFORMATION pi{}; - BOOL res = CreateProcess(cmd, cmdline.get(), 0, 0, TRUE, flags, 0, 0, &si, &pi); - if (!res) { - return false; - } - - process_ = pi.hProcess; - - // We don't need to use these - ResetHandle(pi.hThread); - ResetHandle(in_.read_); - ResetHandle(out_.write_); - ResetHandle(err_.write_); - - return true; - } - - void Kill() - { - if (process_ != INVALID_HANDLE_VALUE) { - in_.reset(); - if (WaitForSingleObject(process_, 500) == WAIT_TIMEOUT) { - TerminateProcess(process_, 0); - } - ResetHandle(process_); - out_.reset(); - err_.reset(); - } - } - - int Read(char* buffer, unsigned int len) - { - DWORD read = 0; - BOOL res = ReadFile(out_.read_, buffer, len, &read, 0); - if (!res) { - return -1; - } - return read; - } - - bool Write(char const* buffer, unsigned int len) - { - while (len > 0) { - DWORD written = 0; - BOOL res = WriteFile(in_.write_, buffer, len, &written, 0); - if (!res || written == 0) { - return false; - } - buffer += written; - len -= written; - } - return true; - } - -private: - wxString EscapeArgument(wxString const& arg) - { - wxString ret; - - // Treat newlines are whitespace just to be sure, even if MSDN doesn't mention it - if (arg.find_first_of(_T(" \"\t\r\n\v")) != wxString::npos) { - // Quite horrible, as per MSDN: - // Backslashes are interpreted literally, unless they immediately precede a double quotation mark. - // If an even number of backslashes is followed by a double quotation mark, one backslash is placed in the argv array for every pair of backslashes, and the double quotation mark is interpreted as a string delimiter. - // If an odd number of backslashes is followed by a double quotation mark, one backslash is placed in the argv array for every pair of backslashes, and the double quotation mark is "escaped" by the remaining backslash, causing a literal double quotation mark (") to be placed in argv. - - ret = _T("\""); - int backslashCount = 0; - for (auto it = arg.begin(); it != arg.end(); ++it) { - if (*it == '\\') { - ++backslashCount; - } - else { - if (*it == '"') { - // Escape all preceeding backslashes and escape the quote - ret += wxString(backslashCount + 1, '\\'); - } - backslashCount = 0; - } - ret += *it; - } - if (backslashCount) { - // Escape all preceeding backslashes - ret += wxString(backslashCount, '\\'); - } - - ret += _T("\""); - } - else { - ret = arg; - } - - return ret; - } - - std::unique_ptr GetCmdLine(wxString const& cmd, std::vector const& args) - { - wxString cmdline = EscapeArgument(cmd); - - for (auto const& arg : args) { - if (!arg.empty()) { - cmdline += _T(" ") + EscapeArgument(arg); - } - } - std::unique_ptr ret; - ret.reset(new wxChar[cmdline.size() + 1]); - wxStrcpy(ret.get(), cmdline); - return ret; - } - - HANDLE process_{INVALID_HANDLE_VALUE}; - - Pipe in_; - Pipe out_; - Pipe err_; -}; - -#else - -#include -#include -#include - -namespace { -void ResetFd(int& fd) -{ - if (fd != -1) { - close(fd); - fd = -1; - } -} - -class Pipe final -{ -public: - Pipe() = default; - - ~Pipe() - { - reset(); - } - - Pipe(Pipe const&) = delete; - Pipe& operator=(Pipe const&) = delete; - - bool Create() - { - reset(); - - int fds[2]; - if (pipe(fds) != 0) { - return false; - } - - read_ = fds[0]; - write_ = fds[1]; - - return valid(); - } - - bool valid() const { - return read_ != -1 && write_ != -1; - } - - void reset() - { - ResetFd(read_); - ResetFd(write_); - } - - int read_{-1}; - int write_{-1}; -}; -} - -class CProcess::Impl -{ -public: - Impl() = default; - ~Impl() - { - Kill(); - } - - Impl(Impl const&) = delete; - Impl& operator=(Impl const&) = delete; - - bool CreatePipes() - { - return - in_.Create() && - out_.Create() && - err_.Create(); - } - - void MakeArg(wxString const& arg, std::vector> & argList) - { - wxCharBuffer buf = arg.mb_str(); - std::unique_ptr ret; - ret.reset(new char[buf.length() + 1]); - strcpy(ret.get(), buf); - argList.push_back(std::move(ret)); - } - - void GetArgv(wxString const& cmd, std::vector const& args, std::vector> & argList, std::unique_ptr & argV) - { - MakeArg(cmd, argList); - for (auto const& a : args) { - MakeArg(a, argList); - } - - argV.reset(new char *[argList.size() + 1]); - char ** v = argV.get(); - for (auto const& a : argList) { - *(v++) = a.get(); - } - *v = 0; - } - - bool Execute(wxString const& cmd, std::vector const& args) - { - if (!CreatePipes()) { - return false; - } - - int pid = fork(); - if (pid < 0) { - return false; - } - else if (!pid) { - // We're the child. - - // Close uneeded descriptors - ResetFd(in_.write_); - ResetFd(out_.read_); - ResetFd(err_.read_); - - // Redirect to pipe - if (dup2(in_.read_, STDIN_FILENO) == -1 || - dup2(out_.write_, STDOUT_FILENO) == -1 || - dup2(err_.write_, STDERR_FILENO) == -1) - { - _exit(-1); - } - - std::vector> argList; - std::unique_ptr argV; - GetArgv(cmd, args, argList, argV); - - // Execute process - execv(cmd.mb_str(), argV.get());//argV.get()); // noreturn on success - - _exit(-1); - } - else { - // We're the parent - pid_ = pid; - - // Close unneeded descriptors - ResetFd(in_.read_); - ResetFd(out_.write_); - ResetFd(err_.write_); - } - - return true; - } - - void Kill() - { - in_.reset(); - - if (pid_ != -1) { - kill(pid_, SIGTERM); - - int ret; - do { - } - while((ret = waitpid(pid_, 0, 0)) == -1 && errno == EINTR); - - (void)ret; - - pid_ = -1; - } - - out_.reset(); - err_.reset(); - } - - int Read(char* buffer, unsigned int len) - { - int r; - do { - r = read(out_.read_, buffer, len); - } - while (r == -1 && (errno == EAGAIN || errno == EINTR)); - - return r; - } - - bool Write(char const* buffer, unsigned int len) - { - while (len) { - int written; - do { - written = write(in_.write_, buffer, len); - } - while (written == -1 && (errno == EAGAIN || errno == EINTR)); - - if (written <= 0) { - return false; - } - - len -= written; - buffer += written; - } - return true; - } - - Pipe in_; - Pipe out_; - Pipe err_; - - int pid_{-1}; -}; - -#endif - - -CProcess::CProcess() - : impl_(std::make_unique()) -{ -} - -CProcess::~CProcess() -{ - impl_.reset(); -} - -bool CProcess::Execute(wxString const& cmd, std::vector const& args) -{ - return impl_ ? impl_->Execute(cmd, args) : false; -} - -void CProcess::Kill() -{ - if (impl_) { - impl_->Kill(); - } -} - -int CProcess::Read(char* buffer, unsigned int len) -{ - return impl_ ? impl_->Read(buffer, len) : -1; -} - -bool CProcess::Write(char const* buffer, unsigned int len) -{ - return impl_ ? impl_->Write(buffer, len) : false; -} diff -Nru filezilla-3.14.1/src/engine/fzprocess.h filezilla-3.15.0.2/src/engine/fzprocess.h --- filezilla-3.14.1/src/engine/fzprocess.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/fzprocess.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#ifndef FILEZILLA_ENGINE_PROCESS_HEADER -#define FILEZILLA_ENGINE_PROCESS_HEADER - -/* -The CProcess class manages an asynchronous process with redirected IO. -No console window is being created. - -To use, spawn the process and call read from a different thread. -*/ - -#include -#include - -class CProcess final -{ -public: - CProcess(); - ~CProcess(); - - CProcess(CProcess const&) = delete; - CProcess& operator=(CProcess const&) = delete; - - bool Execute(wxString const& cmd, std::vector const& args); - - void Kill(); - - // Blocking function. Returns Number of bytes read, 0 on EOF, -1 on error. - int Read(char* buffer, unsigned int len); - - // Blocking function - bool Write(char const* buffer, unsigned int len); - -private: - class Impl; - std::unique_ptr impl_; -}; - -#endif diff -Nru filezilla-3.14.1/src/engine/httpcontrolsocket.cpp filezilla-3.15.0.2/src/engine/httpcontrolsocket.cpp --- filezilla-3.14.1/src/engine/httpcontrolsocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/httpcontrolsocket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -3,9 +3,11 @@ #include "ControlSocket.h" #include "engineprivate.h" #include "httpcontrolsocket.h" -#include "local_filesys.h" #include "tlssocket.h" +#include +#include + #include #define FZ_REPLY_REDIRECTED FZ_REPLY_ALREADYCONNECTED @@ -92,7 +94,7 @@ CHttpControlSocket::~CHttpControlSocket() { - RemoveHandler(); + remove_handler(); DoClose(); delete [] m_pRecvBuffer; } @@ -344,7 +346,7 @@ m_current_uri = wxURI(m_pCurrentServer->FormatServer() + pData->remotePath.FormatFilename(pData->remoteFile)); if (!localFile.empty()) { - pData->localFileSize = CLocalFileSystem::GetSize(pData->localFile); + pData->localFileSize = fz::local_filesys::get_size(fz::to_native(pData->localFile)); pData->opState = filetransfer_waitfileexists; int res = CheckOverwriteFile(); @@ -453,8 +455,9 @@ pData->port = port; pData->tls = tls; - if (!IsIpAddress(host)) + if (fz::get_address_type(host.ToStdWstring()) == fz::address_type::unknown) { LogMessage(MessageType::Status, _("Resolving address of %s"), host); + } pData->host = host; return DoInternalConnect(); @@ -970,8 +973,7 @@ int CHttpControlSocket::ParseSubcommandResult(int prevResult) { LogMessage(MessageType::Debug_Verbose, _T("CHttpControlSocket::SendNextCommand(%d)"), prevResult); - if (!m_pCurOpData) - { + if (!m_pCurOpData) { LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Warning, _T("SendNextCommand called without active operation")); ResetOperation(FZ_REPLY_ERROR); return FZ_REPLY_ERROR; @@ -996,22 +998,21 @@ return FZ_REPLY_OK; } -int CHttpControlSocket::OpenFile( CHttpFileTransferOpData* pData) +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)) - { + 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 ) { + if (!end) { pData->resume = false; } - pData->localFileSize = CLocalFileSystem::GetSize(pData->localFile); + pData->localFileSize = fz::local_filesys::get_size(fz::to_native(pData->localFile)); return FZ_REPLY_OK; } diff -Nru filezilla-3.14.1/src/engine/iothread.cpp filezilla-3.15.0.2/src/engine/iothread.cpp --- filezilla-3.14.1/src/engine/iothread.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/iothread.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,12 +1,12 @@ #include -#include "file.h" #include "iothread.h" +#include + #include CIOThread::CIOThread() - : wxThread(wxTHREAD_JOINABLE) { m_buffers[0] = new char[BUFFERSIZE*BUFFERCOUNT]; for (unsigned int i = 0; i < BUFFERCOUNT; ++i) { @@ -28,13 +28,13 @@ // 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) - m_pFile->Truncate(); + m_pFile->truncate(); m_pFile.reset(); } } -bool CIOThread::Create(std::unique_ptr && pFile, bool read, bool binary) +bool CIOThread::Create(std::unique_ptr && pFile, bool read, bool binary) { wxASSERT(pFile); @@ -54,23 +54,26 @@ } #ifdef SIMULATE_IO - size_ = m_pFile->Length(); + size_ = m_pFile->size(); #endif - + m_running = true; - wxThread::Create(); - wxThread::Run(); - + + if (!run()) { + m_running = false; + return false; + } + return true; } -wxThread::ExitCode CIOThread::Entry() +void CIOThread::entry() { if (m_read) { while (m_running) { - int len = ReadFromFile(m_buffers[m_curThreadBuf], BUFFERSIZE); + auto len = ReadFromFile(m_buffers[m_curThreadBuf], BUFFERSIZE); - scoped_lock l(m_mutex); + fz::scoped_lock l(m_mutex); if (m_appWaiting) { if (!m_evtHandler) { @@ -78,10 +81,10 @@ break; } m_appWaiting = false; - m_evtHandler->SendEvent(); + m_evtHandler->send_event(); } - if (len == wxInvalidOffset) { + if (len == -1) { m_error = true; m_running = false; break; @@ -106,10 +109,10 @@ } } else { - scoped_lock l(m_mutex); + fz::scoped_lock l(m_mutex); while (m_curAppBuf == -1) { if (!m_running) { - return 0; + return; } else { m_threadWaiting = true; @@ -120,7 +123,7 @@ for (;;) { while (m_curThreadBuf == m_curAppBuf) { if (!m_running) { - return 0; + return; } m_threadWaiting = true; m_condition.wait(l); @@ -141,7 +144,7 @@ break; } m_appWaiting = false; - m_evtHandler->SendEvent(); + m_evtHandler->send_event(); } if (m_error) @@ -150,15 +153,11 @@ ++m_curThreadBuf %= BUFFERCOUNT; } } - - return 0; } int CIOThread::GetNextWriteBuffer(char** pBuffer) { - wxASSERT(!m_destroyed); - - scoped_lock l(m_mutex); + fz::scoped_lock l(m_mutex); if (m_error) return IO_Error; @@ -190,9 +189,6 @@ { wxASSERT(m_pFile); - if (m_destroyed) - return true; - Destroy(); if (m_curAppBuf == -1) @@ -210,21 +206,23 @@ #ifndef __WXMSW__ 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 + + m_curAppBuf = -1; + return true; } int CIOThread::GetNextReadBuffer(char** pBuffer) { - wxASSERT(!m_destroyed); wxASSERT(m_read); int newBuf = (m_curAppBuf + 1) % BUFFERCOUNT; - scoped_lock l(m_mutex); + fz::scoped_lock l(m_mutex); if (newBuf == m_curThreadBuf) { if (m_error) @@ -250,23 +248,21 @@ void CIOThread::Destroy() { - if (m_destroyed) - return; - m_destroyed = true; - - scoped_lock l(m_mutex); - - m_running = false; - if (m_threadWaiting) { - m_threadWaiting = false; - m_condition.signal(l); + { + fz::scoped_lock l(m_mutex); + if (m_running) { + m_running = false; + if (m_threadWaiting) { + m_threadWaiting = false; + m_condition.signal(l); + } + } } - l.unlock(); - Wait(wxTHREAD_WAIT_BLOCK); + join(); } -int CIOThread::ReadFromFile(char* pBuffer, int maxLen) +int64_t CIOThread::ReadFromFile(char* pBuffer, int64_t maxLen) { #ifdef SIMULATE_IO if (size_ < 0) { @@ -282,7 +278,7 @@ #ifndef __WXMSW__ if (m_binary) #endif - return m_pFile->Read(pBuffer, maxLen); + return m_pFile->read(pBuffer, maxLen); #ifndef __WXMSW__ @@ -291,8 +287,8 @@ const int readLen = maxLen / 2; char* r = pBuffer + readLen; - int len = m_pFile->Read(r, readLen); - if (!len || len == wxInvalidOffset) + auto len = m_pFile->read(r, readLen); + if (!len || len <= -1) return len; const char* const end = r + len; @@ -318,7 +314,7 @@ #endif } -bool CIOThread::WriteToFile(char* pBuffer, int len) +bool CIOThread::WriteToFile(char* pBuffer, int64_t len) { #ifdef SIMULATE_IO return true; @@ -333,39 +329,55 @@ #ifndef __WXMSW__ } else { + // On all CRLF pairs, omit the CR. Don't harm stand-alone CRs - // I assume disk access is buffered, otherwise the 1 byte writes are - // going to hurt performance. - const char CR = '\r'; + + // Handle trailing CR from last write + if (m_wasCarriageReturn && len && *pBuffer != '\n' && *pBuffer != '\r') { + m_wasCarriageReturn = false; + const char CR = '\r'; + if (!DoWrite(&CR, 1)) + return false; + } + + // Skip forward to end of buffer or first CR + const char* r = pBuffer; const char* const end = pBuffer + len; - for (char* r = pBuffer; r != end; ++r) { - char c = *r; - if (c == '\r') - m_wasCarriageReturn = true; - else if (c == '\n') { - m_wasCarriageReturn = false; - if (!DoWrite(&c, 1)) - return false; - } - else { - if (m_wasCarriageReturn) { + while (r != end && *r != '\r') { + ++r; + } + + if (r != end) { + // Now we gotta move data and also handle additional CRs. + m_wasCarriageReturn = true; + + char* w = const_cast(r++); + for (; r != end; ++r) { + if (*r == '\r') { + m_wasCarriageReturn = true; + } + else if (*r == '\n') { m_wasCarriageReturn = false; - if (!DoWrite(&CR, 1)) - return false; + *(w++) = *r; + } + else { + if (m_wasCarriageReturn) { + m_wasCarriageReturn = false; + *(w++) = '\r'; + } + *(w++) = *r; } - - if (!DoWrite(&c, 1)) - return false; } + len = w - pBuffer; } - return true; + return DoWrite(pBuffer, len); } #endif } -bool CIOThread::DoWrite(const char* pBuffer, int len) +bool CIOThread::DoWrite(const char* pBuffer, int64_t len) { - int written = m_pFile->Write(pBuffer, len); + auto written = m_pFile->write(pBuffer, len); if (written == len) { return true; } @@ -374,7 +386,7 @@ const wxString error = wxSysErrorMsg(code); - scoped_lock locker(m_mutex); + fz::scoped_lock locker(m_mutex); m_error_description = error; return false; @@ -382,12 +394,12 @@ wxString CIOThread::GetError() { - scoped_lock locker(m_mutex); + fz::scoped_lock locker(m_mutex); return m_error_description; } -void CIOThread::SetEventHandler(CEventHandler* handler) +void CIOThread::SetEventHandler(fz::event_handler* handler) { - scoped_lock locker(m_mutex); + fz::scoped_lock locker(m_mutex); m_evtHandler = handler; } diff -Nru filezilla-3.14.1/src/engine/iothread.h filezilla-3.15.0.2/src/engine/iothread.h --- filezilla-3.14.1/src/engine/iothread.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/iothread.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,8 +1,7 @@ #ifndef __IOTHREAD_H__ #define __IOTHREAD_H__ -#include -#include "event_loop.h" +#include #define BUFFERCOUNT 5 #define BUFFERSIZE 128*1024 @@ -13,7 +12,7 @@ //#define SIMULATE_IO struct io_thread_event_type{}; -typedef CEvent CIOThreadEvent; +typedef fz::simple_event CIOThreadEvent; enum IORet { @@ -22,21 +21,24 @@ IO_Again = -1 }; -class CFile; -class CIOThread final : protected wxThread +namespace fz { +class file; +} + +class CIOThread final : protected fz::thread { public: CIOThread(); virtual ~CIOThread(); - bool Create(std::unique_ptr && pFile, bool read, bool binary); + bool Create(std::unique_ptr && pFile, bool read, bool binary); virtual 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 // get triggerd iff a buffer is available after a call to the // GetNext*Buffer functions returned IO_Again - void SetEventHandler(CEventHandler* handler); + void SetEventHandler(fz::event_handler* handler); // Gets next buffer // Return value: IO_Success on EOF @@ -55,26 +57,26 @@ wxString GetError(); -protected: +private: void Close(); - virtual ExitCode Entry(); + virtual void entry(); - int ReadFromFile(char* pBuffer, int maxLen); - bool WriteToFile(char* pBuffer, int len); - bool DoWrite(const char* pBuffer, int len); + int64_t ReadFromFile(char* pBuffer, int64_t maxLen); + bool WriteToFile(char* pBuffer, int64_t len); + bool DoWrite(const char* pBuffer, int64_t len); - CEventHandler* m_evtHandler{}; + fz::event_handler* m_evtHandler{}; bool m_read{}; bool m_binary{}; - std::unique_ptr m_pFile; + std::unique_ptr m_pFile; char* m_buffers[BUFFERCOUNT]; unsigned int m_bufferLens[BUFFERCOUNT]; - mutex m_mutex; - condition m_condition; + fz::mutex m_mutex; + fz::condition m_condition; int m_curAppBuf{}; int m_curThreadBuf{}; @@ -84,14 +86,12 @@ bool m_threadWaiting{}; bool m_appWaiting{}; - bool m_destroyed{}; - bool m_wasCarriageReturn{}; wxString m_error_description; #ifdef SIMULATE_IO - wxFileOffset size_{}; + int64_t size_{}; #endif }; diff -Nru filezilla-3.14.1/src/engine/local_filesys.cpp filezilla-3.15.0.2/src/engine/local_filesys.cpp --- filezilla-3.14.1/src/engine/local_filesys.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/local_filesys.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,742 +0,0 @@ -#include - -#include "local_filesys.h" -#include - -#include -#include -#include - -#ifdef __WXMSW__ -const wxChar CLocalFileSystem::path_separator = '\\'; -#else -const wxChar CLocalFileSystem::path_separator = '/'; - -#include -#endif - -namespace { -template -int64_t make_int64_t(T hi, T lo) -{ - return (static_cast(hi) << 32) + static_cast(lo); -} -} - -CLocalFileSystem::~CLocalFileSystem() -{ - EndFindFiles(); -} - -CLocalFileSystem::local_fileType CLocalFileSystem::GetFileType(const wxString& path) -{ -#ifdef __WXMSW__ - DWORD result = GetFileAttributes(path); - if (result == INVALID_FILE_ATTRIBUTES) - return unknown; - - if (result & FILE_ATTRIBUTE_REPARSE_POINT) - return link; - - if (result & FILE_ATTRIBUTE_DIRECTORY) - return dir; - - return file; -#else - if (!path.empty() && path.Last() == '/' && path != _T("/")) { - wxString tmp = path; - tmp.RemoveLast(); - return GetFileType(tmp); - } - - wxStructStat buf; - int result = wxLstat(path, &buf); - if (result) - return unknown; - -#ifdef S_ISLNK - if (S_ISLNK(buf.st_mode)) - return link; -#endif - - if (S_ISDIR(buf.st_mode)) - return dir; - - return file; -#endif -} - -bool CLocalFileSystem::RecursiveDelete(const wxString& path, wxWindow* parent) -{ - std::list paths; - paths.push_back(path); - return RecursiveDelete(paths, parent); -} - -bool CLocalFileSystem::RecursiveDelete(std::list dirsToVisit, wxWindow* parent) -{ - // Under Windows use SHFileOperation to delete files and directories. - // Under other systems, we have to recurse into subdirectories manually - // to delete all contents. - -#ifdef __WXMSW__ - // SHFileOperation accepts a list of null-terminated strings. Go through all - // paths to get the required buffer length - - size_t len = 1; // String list terminated by empty string - - for (auto const& dir : dirsToVisit) { - len += dir.size() + 1; - } - - // Allocate memory - wxChar* pBuffer = new wxChar[len]; - wxChar* p = pBuffer; - - for (auto& dir : dirsToVisit) { - if (!dir.empty() && dir.Last() == wxFileName::GetPathSeparator()) - dir.RemoveLast(); - if (GetFileType(dir) == unknown) - continue; - - _tcscpy(p, dir); - p += dir.size() + 1; - } - if (p != pBuffer) { - *p = 0; - - // Now we can delete the files in the buffer - SHFILEOPSTRUCT op; - memset(&op, 0, sizeof(op)); - op.hwnd = parent ? (HWND)parent->GetHandle() : 0; - op.wFunc = FO_DELETE; - op.pFrom = pBuffer; - - if (parent) { - // Move to trash if shift is not pressed, else delete - op.fFlags = wxGetKeyState(WXK_SHIFT) ? 0 : FOF_ALLOWUNDO; - } - else - op.fFlags = FOF_NOCONFIRMATION; - - SHFileOperation(&op); - } - delete [] pBuffer; - - return true; -#else - if (parent) { - if (wxMessageBoxEx(_("Really delete all selected files and/or directories from your computer?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, parent) != wxYES) - return true; - } - - for (auto& dir : dirsToVisit) { - if (!dir.empty() && dir.Last() == '/' && dir != _T("/")) - dir.RemoveLast(); - } - - bool encodingError = false; - - // Remember the directories to delete after recursing into them - std::list dirsToDelete; - - CLocalFileSystem fs; - - // Process all dirctories that have to be visited - while (!dirsToVisit.empty()) { - auto const iter = dirsToVisit.begin(); - wxString const& path = *iter; - - if (GetFileType(path) != dir) { - wxRemoveFile(path); - dirsToVisit.erase(iter); - continue; - } - - dirsToDelete.splice(dirsToDelete.begin(), dirsToVisit, iter); - - if (!fs.BeginFindFiles(path, false)) { - continue; - } - - // Depending on underlying platform, wxDir does not handle - // changes to the directory contents very well. - // See https://trac.filezilla-project.org/ticket/3482 - // To work around this, delete files after enumerating everything in current directory - std::list filesToDelete; - - wxString file; - while (fs.GetNextFile(file)) { - if (file.empty()) { - encodingError = true; - continue; - } - - const wxString& fullName = path + _T("/") + file; - - if (CLocalFileSystem::GetFileType(fullName) == CLocalFileSystem::dir) - dirsToVisit.push_back(fullName); - else - filesToDelete.push_back(fullName); - } - fs.EndFindFiles(); - - // Delete all files and links in current directory enumerated before - for (auto const& file : filesToDelete) { - wxRemoveFile(file); - } - } - - // Delete the now empty directories - for (auto const& dir : dirsToDelete) { - wxRmdir(dir); - } - - return !encodingError; -#endif -} - -CLocalFileSystem::local_fileType CLocalFileSystem::GetFileInfo(const wxString& path, bool &isLink, int64_t* size, CDateTime* modificationTime, int *mode) -{ -#ifdef __WXMSW__ - if (!path.empty() && path.Last() == wxFileName::GetPathSeparator() && path != wxFileName::GetPathSeparator()) { - wxString tmp = path; - tmp.RemoveLast(); - return GetFileInfo(tmp, isLink, size, modificationTime, mode); - } - - isLink = false; - - WIN32_FILE_ATTRIBUTE_DATA attributes; - BOOL result = GetFileAttributesEx(path, GetFileExInfoStandard, &attributes); - if (!result) { - if (size) - *size = -1; - if (mode) - *mode = 0; - if (modificationTime) - *modificationTime = CDateTime(); - return unknown; - } - - bool is_dir = (attributes.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - - if (attributes.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { - isLink = true; - - HANDLE hFile = is_dir ? INVALID_HANDLE_VALUE : CreateFile(path, FILE_READ_ATTRIBUTES | FILE_READ_EA, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hFile != INVALID_HANDLE_VALUE) { - BY_HANDLE_FILE_INFORMATION info{}; - int ret = GetFileInformationByHandle(hFile, &info); - CloseHandle(hFile); - if (ret != 0 && !(info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) { - - if (modificationTime) { - if (!modificationTime->Set(info.ftLastWriteTime, CDateTime::milliseconds)) { - modificationTime->Set(info.ftCreationTime, CDateTime::milliseconds); - } - } - - if (mode) - *mode = (int)info.dwFileAttributes; - - if (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - if (size) - *size = -1; - return dir; - } - - if (size) - *size = make_int64_t(info.nFileSizeHigh, info.nFileSizeLow); - - return file; - } - } - - if (size) - *size = -1; - if (mode) - *mode = 0; - if (modificationTime) - *modificationTime = CDateTime(); - return is_dir ? dir : unknown; - } - - if (modificationTime) { - *modificationTime = CDateTime(attributes.ftLastWriteTime, CDateTime::milliseconds); - if (!modificationTime->IsValid()) { - *modificationTime = CDateTime(attributes.ftCreationTime, CDateTime::milliseconds); - } - } - - if (mode) - *mode = (int)attributes.dwFileAttributes; - - if (is_dir) { - if (size) - *size = -1; - return dir; - } - else { - if (size) - *size = make_int64_t(attributes.nFileSizeHigh, attributes.nFileSizeLow); - return file; - } -#else - if (!path.empty() && path.Last() == '/' && path != _T("/")) { - wxString tmp = path; - tmp.RemoveLast(); - return GetFileInfo(tmp, isLink, size, modificationTime, mode); - } - - const wxCharBuffer p = path.fn_str(); - return GetFileInfo((const char*)p, isLink, size, modificationTime, mode); -#endif -} - -#ifndef __WXMSW__ -CLocalFileSystem::local_fileType CLocalFileSystem::GetFileInfo(const char* path, bool &isLink, int64_t* size, CDateTime* modificationTime, int *mode) -{ - struct stat buf; - int result = lstat(path, &buf); - if (result) - { - isLink = false; - if (size) - *size = -1; - if (mode) - *mode = -1; - if (modificationTime) - *modificationTime = CDateTime(); - return unknown; - } - -#ifdef S_ISLNK - if (S_ISLNK(buf.st_mode)) - { - isLink = true; - int result = stat(path, &buf); - if (result) - { - if (size) - *size = -1; - if (mode) - *mode = -1; - if (modificationTime) - *modificationTime = CDateTime(); - return unknown; - } - } - else -#endif - isLink = false; - - if (modificationTime) - *modificationTime = CDateTime(buf.st_mtime, CDateTime::seconds); - - if (mode) - *mode = buf.st_mode & 0x777; - - if (S_ISDIR(buf.st_mode)) - { - if (size) - *size = -1; - return dir; - } - - if (size) - *size = buf.st_size; - - return file; -} -#endif - -bool CLocalFileSystem::BeginFindFiles(wxString path, bool dirs_only) -{ - if (path.empty()) { - return false; - } - - EndFindFiles(); - - m_dirs_only = dirs_only; -#ifdef __WXMSW__ - if (path.Last() != '/' && path.Last() != '\\') { - m_find_path = path + _T("\\"); - path += _T("\\*"); - } - else { - m_find_path = path; - path += '*'; - } - - m_hFind = FindFirstFileEx(path, FindExInfoStandard, &m_find_data, dirs_only ? FindExSearchLimitToDirectories : FindExSearchNameMatch, 0, 0); - if (m_hFind == INVALID_HANDLE_VALUE) { - m_found = false; - return false; - } - - m_found = true; - return true; -#else - if (path != _T("/") && path.Last() == '/') - path.RemoveLast(); - - const wxCharBuffer s = path.fn_str(); - - m_dir = opendir(s); - if (!m_dir) - return false; - - const wxCharBuffer p = path.fn_str(); - const int len = strlen(p); - m_raw_path = new char[len + 2048 + 2]; - m_buffer_length = len + 2048 + 2; - strcpy(m_raw_path, p); - if (len > 1) - { - m_raw_path[len] = '/'; - m_file_part = m_raw_path + len + 1; - } - else - m_file_part = m_raw_path + len; - - return true; -#endif -} - -void CLocalFileSystem::EndFindFiles() -{ -#ifdef __WXMSW__ - m_found = false; - if (m_hFind != INVALID_HANDLE_VALUE) - { - FindClose(m_hFind); - m_hFind = INVALID_HANDLE_VALUE; - } -#else - if (m_dir) - { - closedir(m_dir); - m_dir = 0; - } - delete [] m_raw_path; - m_raw_path = 0; - m_file_part = 0; -#endif -} - -bool CLocalFileSystem::GetNextFile(wxString& name) -{ -#ifdef __WXMSW__ - if (!m_found) - return false; - do { - name = m_find_data.cFileName; - if (name.empty()) { - m_found = FindNextFile(m_hFind, &m_find_data) != 0; - return true; - } - if (name == _T(".") || name == _T("..")) - continue; - - if (m_dirs_only && !(m_find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - continue; - - m_found = FindNextFile(m_hFind, &m_find_data) != 0; - return true; - } while ((m_found = FindNextFile(m_hFind, &m_find_data) != 0)); - - return false; -#else - if (!m_dir) - return false; - - struct dirent* entry; - while ((entry = readdir(m_dir))) { - if (!entry->d_name[0] || - !strcmp(entry->d_name, ".") || - !strcmp(entry->d_name, "..")) - continue; - - if (m_dirs_only) { -#if HAVE_STRUCT_DIRENT_D_TYPE - if (entry->d_type == DT_LNK) - { - bool wasLink; - AllocPathBuffer(entry->d_name); - strcpy(m_file_part, entry->d_name); - if (GetFileInfo(m_raw_path, wasLink, 0, 0, 0) != dir) - continue; - } - else if (entry->d_type != DT_DIR) - continue; -#else - // Solaris doesn't have d_type - bool wasLink; - AllocPathBuffer(entry->d_name); - strcpy(m_file_part, entry->d_name); - if (GetFileInfo(m_raw_path, wasLink, 0, 0, 0) != dir) - continue; -#endif - } - - name = wxString(entry->d_name, *wxConvFileName); - - return true; - } - - return false; -#endif -} - -bool CLocalFileSystem::GetNextFile(wxString& name, bool &isLink, bool &is_dir, int64_t* size, CDateTime* modificationTime, int* mode) -{ -#ifdef __WXMSW__ - if (!m_found) - return false; - do - { - if (!m_find_data.cFileName[0]) { - m_found = FindNextFile(m_hFind, &m_find_data) != 0; - return true; - } - if (m_dirs_only && !(m_find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - continue; - - if (m_find_data.cFileName[0] == '.' && (!m_find_data.cFileName[1] || (m_find_data.cFileName[1] == '.' && !m_find_data.cFileName[2]))) - continue; - name = m_find_data.cFileName; - - is_dir = (m_find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - - isLink = (m_find_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0; - if (isLink) { - HANDLE hFile = is_dir ? INVALID_HANDLE_VALUE : CreateFile(m_find_path + name, FILE_READ_ATTRIBUTES | FILE_READ_EA, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hFile != INVALID_HANDLE_VALUE) { - BY_HANDLE_FILE_INFORMATION info{}; - int ret = GetFileInformationByHandle(hFile, &info); - CloseHandle(hFile); - if (ret != 0 && !(info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) { - - if (modificationTime) { - *modificationTime = CDateTime(info.ftLastWriteTime, CDateTime::milliseconds); - if (!modificationTime->IsValid()) { - *modificationTime = CDateTime(info.ftCreationTime, CDateTime::milliseconds); - } - } - - if (mode) - *mode = (int)info.dwFileAttributes; - - is_dir = (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - if (size) { - if (is_dir) { - *size = -1; - } - else { - *size = make_int64_t(info.nFileSizeHigh, info.nFileSizeLow); - } - } - - m_found = FindNextFile(m_hFind, &m_find_data) != 0; - return true; - } - } - - if (m_dirs_only && !is_dir) { - continue; - } - - if (size) - *size = -1; - if (mode) - *mode = 0; - if (modificationTime) - *modificationTime = CDateTime(); - } - else { - if (modificationTime) { - *modificationTime = CDateTime(m_find_data.ftLastWriteTime, CDateTime::milliseconds); - if (!modificationTime->IsValid()) { - *modificationTime = CDateTime(m_find_data.ftLastWriteTime, CDateTime::milliseconds); - } - } - - if (mode) - *mode = (int)m_find_data.dwFileAttributes; - - if (size) { - if (is_dir) { - *size = -1; - } - else { - *size = make_int64_t(m_find_data.nFileSizeHigh, m_find_data.nFileSizeLow); - } - } - } - m_found = FindNextFile(m_hFind, &m_find_data) != 0; - return true; - } while ((m_found = FindNextFile(m_hFind, &m_find_data) != 0)); - - return false; -#else - if (!m_dir) - return false; - - struct dirent* entry; - while ((entry = readdir(m_dir))) - { - if (!entry->d_name[0] || - !strcmp(entry->d_name, ".") || - !strcmp(entry->d_name, "..")) - continue; - -#if HAVE_STRUCT_DIRENT_D_TYPE - if (m_dirs_only) - { - if (entry->d_type == DT_LNK) - { - AllocPathBuffer(entry->d_name); - strcpy(m_file_part, entry->d_name); - local_fileType type = GetFileInfo(m_raw_path, isLink, size, modificationTime, mode); - if (type != dir) - continue; - - name = wxString(entry->d_name, *wxConvFileName); - is_dir = true; - return true; - } - else if (entry->d_type != DT_DIR) - continue; - } -#endif - - AllocPathBuffer(entry->d_name); - strcpy(m_file_part, entry->d_name); - local_fileType type = GetFileInfo(m_raw_path, isLink, size, modificationTime, mode); - - if (type == unknown) // Happens for example in case of permission denied - { -#if HAVE_STRUCT_DIRENT_D_TYPE - type = entry->d_type == DT_DIR ? dir : file; -#else - type = file; -#endif - isLink = 0; - if (size) - *size = -1; - if (modificationTime) - *modificationTime = CDateTime(); - if (mode) - *mode = 0; - } - if (m_dirs_only && type != dir) - continue; - - is_dir = type == dir; - - name = wxString(entry->d_name, *wxConvFileName); - - return true; - } - - return false; -#endif -} - -#ifndef __WXMSW__ -void CLocalFileSystem::AllocPathBuffer(const char* file) -{ - int len = strlen(file); - int pathlen = m_file_part - m_raw_path; - - if (len + pathlen >= m_buffer_length) - { - m_buffer_length = (len + pathlen) * 2; - char* tmp = new char[m_buffer_length]; - memcpy(tmp, m_raw_path, pathlen); - delete [] m_raw_path; - m_raw_path = tmp; - m_file_part = m_raw_path + pathlen; - } -} -#endif - -CDateTime CLocalFileSystem::GetModificationTime( const wxString& path) -{ - CDateTime mtime; - - bool tmp; - if (GetFileInfo(path, tmp, 0, &mtime, 0) == unknown) - mtime = CDateTime(); - - return mtime; -} - -bool CLocalFileSystem::SetModificationTime(const wxString& path, const CDateTime& t) -{ - if (!t.IsValid()) - return false; - -#ifdef __WXMSW__ - FILETIME ft = t.GetFileTime(); - if (!ft.dwHighDateTime) { - return false; - } - - HANDLE h = CreateFile(path, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); - if (h == INVALID_HANDLE_VALUE) - return false; - - bool ret = SetFileTime(h, 0, &ft, &ft) == TRUE; - CloseHandle(h); - return ret; -#else - utimbuf utm{}; - utm.actime = t.GetTimeT(); - utm.modtime = utm.actime; - return utime(path.fn_str(), &utm) == 0; -#endif -} - -int64_t CLocalFileSystem::GetSize(wxString const& path, bool* isLink) -{ - int64_t ret = -1; - bool tmp{}; - local_fileType t = GetFileInfo(path, isLink ? *isLink : tmp, &ret, 0, 0); - if( t != file ) { - ret = -1; - } - - return ret; -} - -wxString CLocalFileSystem::GetSymbolicLinkTarget(wxString const& path) -{ - wxString target; - -#ifdef __WXMSW__ - HANDLE hFile = CreateFile(path, FILE_READ_ATTRIBUTES | FILE_READ_EA, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hFile != INVALID_HANDLE_VALUE) { - DWORD const size = 1024; - wxChar out[size]; - DWORD ret = GetFinalPathNameByHandle(hFile, out, size, 0); - if (ret > 0 && ret < size) { - target = out; - } - CloseHandle(hFile); - } -#else - size_t const size = 1024; - char out[size]; - - const wxCharBuffer p = path.fn_str(); - ssize_t res = readlink(static_cast(p), out, size); - if( res > 0 && static_cast(res) < size ) { - out[res] = 0; - target = wxString(out, *wxConvFileName); - } -#endif - return target; -} diff -Nru filezilla-3.14.1/src/engine/local_path.cpp filezilla-3.15.0.2/src/engine/local_path.cpp --- filezilla-3.14.1/src/engine/local_path.cpp 2015-07-30 13:28:11.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/local_path.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -65,7 +65,7 @@ // It's \\?\c:\foo\bar goto parse_regular; } - if (wxStrlen(in) < 5 || wxStrnicmp(in, _T("UNC\\"), 4)) { + if (fz::strlen(in) < 5 || wxStrnicmp(in, _T("UNC\\"), 4)) { return false; } in += 4; @@ -436,7 +436,7 @@ wxString path = *m_path; if (path.Len() > 3) path.RemoveLast(); - DWORD ret = ::GetFileAttributes(path); + DWORD ret = ::GetFileAttributes(path.wc_str()); if (ret == INVALID_FILE_ATTRIBUTES) { if (!error) return false; @@ -449,7 +449,7 @@ // Check for removable drive, display a more specific error message in that case if (::GetLastError() != ERROR_NOT_READY) return false; - int type = GetDriveType(m_path->Left(3)); + 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); return false; diff -Nru filezilla-3.14.1/src/engine/logging.cpp filezilla-3.15.0.2/src/engine/logging.cpp --- filezilla-3.14.1/src/engine/logging.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/logging.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -21,21 +21,21 @@ wxString CLogging::m_file; int CLogging::m_refcount = 0; -mutex CLogging::mutex_(false); +fz::mutex CLogging::mutex_(false); -thread_local int CLogging::debug_level_{0}; -thread_local int CLogging::raw_listing_{0}; +thread_local int CLogging::debug_level_{}; +thread_local int CLogging::raw_listing_{}; CLogging::CLogging(CFileZillaEnginePrivate & engine) : engine_(engine) { - scoped_lock l(mutex_); + fz::scoped_lock l(mutex_); m_refcount++; } CLogging::~CLogging() { - scoped_lock l(mutex_); + fz::scoped_lock l(mutex_); m_refcount--; if (!m_refcount) { @@ -83,27 +83,28 @@ return true; } -void CLogging::InitLogFile() const +bool CLogging::InitLogFile(fz::scoped_lock& l) const { if (m_logfile_initialized) - return; + return true; m_logfile_initialized = true; m_file = engine_.GetOptions().GetOption(OPTION_LOGGING_FILE); if (m_file.empty()) - return; + return false; #ifdef __WXMSW__ - m_log_fd = CreateFile(m_file, FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + 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) #else m_log_fd = open(m_file.fn_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); if (m_log_fd == -1) #endif { + l.unlock(); //Avoid recursion LogMessage(MessageType::Error, _("Could not open log file: %s"), wxSysErrorMsg()); - return; + return false; } m_prefixes[static_cast(MessageType::Status)] = _("Status:"); @@ -124,13 +125,19 @@ else if (m_max_size > 2000) m_max_size = 2000; m_max_size *= 1024 * 1024; + + return true; } void CLogging::LogToFile(MessageType nMessageType, const wxString& msg) const { - scoped_lock l(mutex_); + fz::scoped_lock l(mutex_); - InitLogFile(); + if (!m_logfile_initialized) { + if (!InitLogFile(l)) { + return; + } + } #ifdef __WXMSW__ if (m_log_fd == INVALID_HANDLE_VALUE) return; @@ -139,14 +146,14 @@ return; #endif - CDateTime now = CDateTime::Now(); + fz::datetime now = fz::datetime::now(); wxString out(wxString::Format(_T("%s %u %d %s %s") #ifdef __WXMSW__ _T("\r\n"), #else _T("\n"), #endif - now.Format(_T("%Y-%m-%d %H:%M:%S"), CDateTime::local), m_pid, engine_.GetEngineId(), m_prefixes[static_cast(nMessageType)], msg)); + now.format(_T("%Y-%m-%d %H:%M:%S"), fz::datetime::local), m_pid, engine_.GetEngineId(), m_prefixes[static_cast(nMessageType)], msg)); const wxWX2MBbuf utf8 = out.mb_str(wxConvUTF8); if (utf8) { @@ -162,11 +169,12 @@ 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; } - HANDLE hFile = CreateFile(m_file, FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + 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(); @@ -174,6 +182,7 @@ ReleaseMutex(hMutex); CloseHandle(hMutex); + l.unlock(); // Avoid recursion LogMessage(MessageType::Error, _("Could not open log file: %s"), error); return; } @@ -187,10 +196,10 @@ // 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"), tmp, MOVEFILE_REPLACE_EXISTING); - DeleteFile(tmp); - MoveFileEx(m_file, m_file + _T(".1"), MOVEFILE_REPLACE_EXISTING); - m_log_fd = CreateFile(m_file, FILE_APPEND_DATA, FILE_SHARE_DELETE | FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + 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(); @@ -204,24 +213,28 @@ CloseHandle(hMutex); } - if (!error.empty()) + if (!error.empty()) { + l.unlock(); // Avoid recursion LogMessage(MessageType::Error, _("Could not open log file: %s"), error); + 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) { - LogMessage(MessageType::Error, _("Could not write to log file: %s"), wxSysErrorMsg()); 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()); } #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 = {0}; + struct flock lock = {}; lock.l_type = F_WRLCK; lock.l_whence = SEEK_SET; lock.l_start = 0; @@ -240,6 +253,7 @@ close(m_log_fd); m_log_fd = -1; + l.unlock(); // Avoid recursion LogMessage(MessageType::Error, error); return; } @@ -264,6 +278,7 @@ // 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; } @@ -277,6 +292,8 @@ if (written != len) { close(m_log_fd); m_log_fd = -1; + + l.unlock(); // Avoid recursion LogMessage(MessageType::Error, _("Could not write to log file: %s"), wxSysErrorMsg()); } #endif diff -Nru filezilla-3.14.1/src/engine/logging_private.h filezilla-3.15.0.2/src/engine/logging_private.h --- filezilla-3.14.1/src/engine/logging_private.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/logging_private.h 2016-02-05 08:54:46.000000000 +0000 @@ -2,7 +2,7 @@ #define __LOGGING_PRIVATE_H__ #include "engineprivate.h" -#include +#include #include class CLogging @@ -75,7 +75,7 @@ private: CFileZillaEnginePrivate & engine_; - void InitLogFile() const; + bool InitLogFile(fz::scoped_lock& l) const; void LogToFile(MessageType nMessageType, const wxString& msg) const; static bool m_logfile_initialized; @@ -91,7 +91,7 @@ static int m_refcount; - static mutex mutex_; + static fz::mutex mutex_; #if HAVE_NO_THREAD_LOCAL // Fixme: Get rid of this once OS X's clang supports it. diff -Nru filezilla-3.14.1/src/engine/Makefile.am filezilla-3.15.0.2/src/engine/Makefile.am --- filezilla-3.14.1/src/engine/Makefile.am 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/Makefile.am 2016-02-05 08:54:46.000000000 +0000 @@ -1,6 +1,7 @@ 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) @@ -14,21 +15,15 @@ directorylistingparser.cpp \ engine_context.cpp \ engineprivate.cpp \ - event_handler.cpp \ - event_loop.cpp \ externalipresolver.cpp \ FileZillaEngine.cpp \ - file.cpp \ ftpcontrolsocket.cpp \ - fzprocess.cpp \ httpcontrolsocket.cpp \ iothread.cpp \ - local_filesys.cpp \ local_path.cpp \ logging.cpp \ misc.cpp \ msgbox.cpp \ - mutex.cpp \ notification.cpp \ option_change_event_handler.cpp \ pathcache.cpp \ @@ -41,7 +36,6 @@ sizeformatting_base.cpp \ socket.cpp \ tlssocket.cpp \ - timeex.cpp \ transfersocket.cpp noinst_HEADERS = backend.h \ @@ -51,7 +45,6 @@ engineprivate.h \ filezilla.h \ ftpcontrolsocket.h \ - fzprocess.h \ httpcontrolsocket.h \ iothread.h \ logging_private.h \ diff -Nru filezilla-3.14.1/src/engine/Makefile.in filezilla-3.15.0.2/src/engine/Makefile.in --- filezilla-3.14.1/src/engine/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -123,19 +123,14 @@ libengine_a-directorylistingparser.$(OBJEXT) \ libengine_a-engine_context.$(OBJEXT) \ libengine_a-engineprivate.$(OBJEXT) \ - libengine_a-event_handler.$(OBJEXT) \ - libengine_a-event_loop.$(OBJEXT) \ libengine_a-externalipresolver.$(OBJEXT) \ libengine_a-FileZillaEngine.$(OBJEXT) \ - libengine_a-file.$(OBJEXT) \ libengine_a-ftpcontrolsocket.$(OBJEXT) \ - libengine_a-fzprocess.$(OBJEXT) \ libengine_a-httpcontrolsocket.$(OBJEXT) \ libengine_a-iothread.$(OBJEXT) \ - libengine_a-local_filesys.$(OBJEXT) \ libengine_a-local_path.$(OBJEXT) libengine_a-logging.$(OBJEXT) \ libengine_a-misc.$(OBJEXT) libengine_a-msgbox.$(OBJEXT) \ - libengine_a-mutex.$(OBJEXT) libengine_a-notification.$(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) \ @@ -144,7 +139,6 @@ libengine_a-sftpcontrolsocket.$(OBJEXT) \ libengine_a-sizeformatting_base.$(OBJEXT) \ libengine_a-socket.$(OBJEXT) libengine_a-tlssocket.$(OBJEXT) \ - libengine_a-timeex.$(OBJEXT) \ libengine_a-transfersocket.$(OBJEXT) libengine_a_OBJECTS = $(am_libengine_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) @@ -262,6 +256,8 @@ 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@ @@ -382,8 +378,8 @@ xdgopen = @xdgopen@ xgettext = @xgettext@ noinst_LIBRARIES = libengine.a -libengine_a_CPPFLAGS = -I$(srcdir)/../include $(LIBGNUTLS_CFLAGS) \ - $(WX_CPPFLAGS) +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 = \ @@ -395,21 +391,15 @@ directorylistingparser.cpp \ engine_context.cpp \ engineprivate.cpp \ - event_handler.cpp \ - event_loop.cpp \ externalipresolver.cpp \ FileZillaEngine.cpp \ - file.cpp \ ftpcontrolsocket.cpp \ - fzprocess.cpp \ httpcontrolsocket.cpp \ iothread.cpp \ - local_filesys.cpp \ local_path.cpp \ logging.cpp \ misc.cpp \ msgbox.cpp \ - mutex.cpp \ notification.cpp \ option_change_event_handler.cpp \ pathcache.cpp \ @@ -422,7 +412,6 @@ sizeformatting_base.cpp \ socket.cpp \ tlssocket.cpp \ - timeex.cpp \ transfersocket.cpp noinst_HEADERS = backend.h \ @@ -432,7 +421,6 @@ engineprivate.h \ filezilla.h \ ftpcontrolsocket.h \ - fzprocess.h \ httpcontrolsocket.h \ iothread.h \ logging_private.h \ @@ -507,20 +495,14 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-directorylistingparser.Po@am__quote@ @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-event_handler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-event_loop.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-file.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-fzprocess.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_filesys.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-mutex.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@ @@ -533,7 +515,6 @@ @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-timeex.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@ @@ -670,34 +651,6 @@ @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` -libengine_a-event_handler.o: 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-event_handler.o -MD -MP -MF $(DEPDIR)/libengine_a-event_handler.Tpo -c -o libengine_a-event_handler.o `test -f 'event_handler.cpp' || echo '$(srcdir)/'`event_handler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-event_handler.Tpo $(DEPDIR)/libengine_a-event_handler.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='event_handler.cpp' object='libengine_a-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-event_handler.o `test -f 'event_handler.cpp' || echo '$(srcdir)/'`event_handler.cpp - -libengine_a-event_handler.obj: 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-event_handler.obj -MD -MP -MF $(DEPDIR)/libengine_a-event_handler.Tpo -c -o libengine_a-event_handler.obj `if test -f 'event_handler.cpp'; then $(CYGPATH_W) 'event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/event_handler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-event_handler.Tpo $(DEPDIR)/libengine_a-event_handler.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='event_handler.cpp' object='libengine_a-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-event_handler.obj `if test -f 'event_handler.cpp'; then $(CYGPATH_W) 'event_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/event_handler.cpp'; fi` - -libengine_a-event_loop.o: event_loop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-event_loop.o -MD -MP -MF $(DEPDIR)/libengine_a-event_loop.Tpo -c -o libengine_a-event_loop.o `test -f 'event_loop.cpp' || echo '$(srcdir)/'`event_loop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-event_loop.Tpo $(DEPDIR)/libengine_a-event_loop.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='event_loop.cpp' object='libengine_a-event_loop.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-event_loop.o `test -f 'event_loop.cpp' || echo '$(srcdir)/'`event_loop.cpp - -libengine_a-event_loop.obj: event_loop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-event_loop.obj -MD -MP -MF $(DEPDIR)/libengine_a-event_loop.Tpo -c -o libengine_a-event_loop.obj `if test -f 'event_loop.cpp'; then $(CYGPATH_W) 'event_loop.cpp'; else $(CYGPATH_W) '$(srcdir)/event_loop.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-event_loop.Tpo $(DEPDIR)/libengine_a-event_loop.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='event_loop.cpp' object='libengine_a-event_loop.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-event_loop.obj `if test -f 'event_loop.cpp'; then $(CYGPATH_W) 'event_loop.cpp'; else $(CYGPATH_W) '$(srcdir)/event_loop.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_at)$(am__mv) $(DEPDIR)/libengine_a-externalipresolver.Tpo $(DEPDIR)/libengine_a-externalipresolver.Po @@ -726,20 +679,6 @@ @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` -libengine_a-file.o: file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-file.o -MD -MP -MF $(DEPDIR)/libengine_a-file.Tpo -c -o libengine_a-file.o `test -f 'file.cpp' || echo '$(srcdir)/'`file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-file.Tpo $(DEPDIR)/libengine_a-file.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='file.cpp' object='libengine_a-file.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-file.o `test -f 'file.cpp' || echo '$(srcdir)/'`file.cpp - -libengine_a-file.obj: file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-file.obj -MD -MP -MF $(DEPDIR)/libengine_a-file.Tpo -c -o libengine_a-file.obj `if test -f 'file.cpp'; then $(CYGPATH_W) 'file.cpp'; else $(CYGPATH_W) '$(srcdir)/file.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-file.Tpo $(DEPDIR)/libengine_a-file.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='file.cpp' object='libengine_a-file.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-file.obj `if test -f 'file.cpp'; then $(CYGPATH_W) 'file.cpp'; else $(CYGPATH_W) '$(srcdir)/file.cpp'; fi` - 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 @@ -754,20 +693,6 @@ @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` -libengine_a-fzprocess.o: fzprocess.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-fzprocess.o -MD -MP -MF $(DEPDIR)/libengine_a-fzprocess.Tpo -c -o libengine_a-fzprocess.o `test -f 'fzprocess.cpp' || echo '$(srcdir)/'`fzprocess.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-fzprocess.Tpo $(DEPDIR)/libengine_a-fzprocess.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fzprocess.cpp' object='libengine_a-fzprocess.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-fzprocess.o `test -f 'fzprocess.cpp' || echo '$(srcdir)/'`fzprocess.cpp - -libengine_a-fzprocess.obj: fzprocess.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-fzprocess.obj -MD -MP -MF $(DEPDIR)/libengine_a-fzprocess.Tpo -c -o libengine_a-fzprocess.obj `if test -f 'fzprocess.cpp'; then $(CYGPATH_W) 'fzprocess.cpp'; else $(CYGPATH_W) '$(srcdir)/fzprocess.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-fzprocess.Tpo $(DEPDIR)/libengine_a-fzprocess.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fzprocess.cpp' object='libengine_a-fzprocess.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-fzprocess.obj `if test -f 'fzprocess.cpp'; then $(CYGPATH_W) 'fzprocess.cpp'; else $(CYGPATH_W) '$(srcdir)/fzprocess.cpp'; fi` - 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 @@ -796,20 +721,6 @@ @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` -libengine_a-local_filesys.o: local_filesys.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_filesys.o -MD -MP -MF $(DEPDIR)/libengine_a-local_filesys.Tpo -c -o libengine_a-local_filesys.o `test -f 'local_filesys.cpp' || echo '$(srcdir)/'`local_filesys.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-local_filesys.Tpo $(DEPDIR)/libengine_a-local_filesys.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_filesys.cpp' object='libengine_a-local_filesys.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_filesys.o `test -f 'local_filesys.cpp' || echo '$(srcdir)/'`local_filesys.cpp - -libengine_a-local_filesys.obj: local_filesys.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-local_filesys.obj -MD -MP -MF $(DEPDIR)/libengine_a-local_filesys.Tpo -c -o libengine_a-local_filesys.obj `if test -f 'local_filesys.cpp'; then $(CYGPATH_W) 'local_filesys.cpp'; else $(CYGPATH_W) '$(srcdir)/local_filesys.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-local_filesys.Tpo $(DEPDIR)/libengine_a-local_filesys.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='local_filesys.cpp' object='libengine_a-local_filesys.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_filesys.obj `if test -f 'local_filesys.cpp'; then $(CYGPATH_W) 'local_filesys.cpp'; else $(CYGPATH_W) '$(srcdir)/local_filesys.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_at)$(am__mv) $(DEPDIR)/libengine_a-local_path.Tpo $(DEPDIR)/libengine_a-local_path.Po @@ -866,20 +777,6 @@ @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` -libengine_a-mutex.o: mutex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-mutex.o -MD -MP -MF $(DEPDIR)/libengine_a-mutex.Tpo -c -o libengine_a-mutex.o `test -f 'mutex.cpp' || echo '$(srcdir)/'`mutex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-mutex.Tpo $(DEPDIR)/libengine_a-mutex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mutex.cpp' object='libengine_a-mutex.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-mutex.o `test -f 'mutex.cpp' || echo '$(srcdir)/'`mutex.cpp - -libengine_a-mutex.obj: mutex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-mutex.obj -MD -MP -MF $(DEPDIR)/libengine_a-mutex.Tpo -c -o libengine_a-mutex.obj `if test -f 'mutex.cpp'; then $(CYGPATH_W) 'mutex.cpp'; else $(CYGPATH_W) '$(srcdir)/mutex.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-mutex.Tpo $(DEPDIR)/libengine_a-mutex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mutex.cpp' object='libengine_a-mutex.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-mutex.obj `if test -f 'mutex.cpp'; then $(CYGPATH_W) 'mutex.cpp'; else $(CYGPATH_W) '$(srcdir)/mutex.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_at)$(am__mv) $(DEPDIR)/libengine_a-notification.Tpo $(DEPDIR)/libengine_a-notification.Po @@ -1062,20 +959,6 @@ @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` -libengine_a-timeex.o: timeex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-timeex.o -MD -MP -MF $(DEPDIR)/libengine_a-timeex.Tpo -c -o libengine_a-timeex.o `test -f 'timeex.cpp' || echo '$(srcdir)/'`timeex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-timeex.Tpo $(DEPDIR)/libengine_a-timeex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='timeex.cpp' object='libengine_a-timeex.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-timeex.o `test -f 'timeex.cpp' || echo '$(srcdir)/'`timeex.cpp - -libengine_a-timeex.obj: timeex.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-timeex.obj -MD -MP -MF $(DEPDIR)/libengine_a-timeex.Tpo -c -o libengine_a-timeex.obj `if test -f 'timeex.cpp'; then $(CYGPATH_W) 'timeex.cpp'; else $(CYGPATH_W) '$(srcdir)/timeex.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libengine_a-timeex.Tpo $(DEPDIR)/libengine_a-timeex.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='timeex.cpp' object='libengine_a-timeex.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-timeex.obj `if test -f 'timeex.cpp'; then $(CYGPATH_W) 'timeex.cpp'; else $(CYGPATH_W) '$(srcdir)/timeex.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 diff -Nru filezilla-3.14.1/src/engine/misc.cpp filezilla-3.15.0.2/src/engine/misc.cpp --- filezilla-3.14.1/src/engine/misc.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/misc.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,357 +4,9 @@ #include #include -#include "timeex.h" -#include "tlssocket.h" - -wxString GetIPV6LongForm(wxString short_address) -{ - if (!short_address.empty() && short_address[0] == '[') { - if (short_address.Last() != ']') - return wxString(); - short_address.RemoveLast(); - short_address = short_address.Mid(1); - } - short_address.MakeLower(); - - wxChar buffer[40] = { '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', '0', 0 - }; - wxChar* out = buffer; - - const unsigned int len = short_address.Len(); - if (len > 39) - return wxString(); - - // First part, before possible :: - unsigned int i = 0; - unsigned int grouplength = 0; - - wxChar const* s = short_address.c_str(); // Get it zero-terminated. - for (i = 0; i < len + 1; ++i) { - const wxChar& c = s[i]; - if (c == ':' || !c) { - if (!grouplength) { - // Empty group length, not valid - if (!c || s[i + 1] != ':') - return wxString(); - ++i; - break; - } - - out += 4 - grouplength; - for (unsigned int j = grouplength; j > 0; j--) - *out++ = s[i - j]; - // End of string... - if (!c) { - if (!*out) - // ...on time - return buffer; - else - // ...premature - return wxString(); - } - else if (!*out) { - // Too long - return wxString(); - } - - ++out; - - grouplength = 0; - if (s[i + 1] == ':') { - ++i; - break; - } - continue; - } - else if ((c < '0' || c > '9') && - (c < 'a' || c > 'f')) - { - // Invalid character - return wxString(); - } - // Too long group - if (++grouplength > 4) - return wxString(); - } - - // Second half after :: - - wxChar* end_first = out; - out = &buffer[38]; - unsigned int stop = i; - for (i = len - 1; i > stop; i--) - { - if (out < end_first) - { - // Too long - return wxString(); - } - - const wxChar& c = s[i]; - if (c == ':') - { - if (!grouplength) - { - // Empty group length, not valid - return wxString(); - } - - out -= 5 - grouplength; - - grouplength = 0; - continue; - } - else if ((c < '0' || c > '9') && - (c < 'a' || c > 'f')) - { - // Invalid character - return wxString(); - } - // Too long group - if (++grouplength > 4) - return wxString(); - *out-- = c; - } - if (!grouplength) - { - // Empty group length, not valid - return wxString(); - } - out -= 5 - grouplength; - out += 2; - - int diff = out - end_first; - if (diff < 0 || diff % 5) - return wxString(); - - return buffer; -} - -int DigitHexToDecNum(wxChar c) -{ - if (c >= 'a') - return c - 'a' + 10; - if (c >= 'A') - return c - 'A' + 10; - else - return c - '0'; -} - -bool IsRoutableAddress(const wxString& address, CSocket::address_family family) -{ - if (family == CSocket::ipv6) - { - wxString long_address = GetIPV6LongForm(address); - if (long_address.size() != 39) - return false; - if (long_address[0] == '0') - { - // ::/128 - if (long_address == _T("0000:0000:0000:0000:0000:0000:0000:0000")) - return false; - // ::1/128 - if (long_address == _T("0000:0000:0000:0000:0000:0000:0000:0001")) - return false; - - if (long_address.Left(30) == _T("0000:0000:0000:0000:0000:ffff:")) - { - // IPv4 mapped - wxString ipv4 = wxString::Format(_T("%d.%d.%d.%d"), - DigitHexToDecNum(long_address[30]) * 16 + DigitHexToDecNum(long_address[31]), - DigitHexToDecNum(long_address[32]) * 16 + DigitHexToDecNum(long_address[33]), - DigitHexToDecNum(long_address[35]) * 16 + DigitHexToDecNum(long_address[36]), - DigitHexToDecNum(long_address[37]) * 16 + DigitHexToDecNum(long_address[38])); - return IsRoutableAddress(ipv4, CSocket::ipv4); - } - - return true; - } - if (long_address[0] == 'f') - { - if (long_address[1] == 'e') - { - // fe80::/10 (link local) - const wxChar& c = long_address[2]; - int v; - if (c >= 'a') - v = c - 'a' + 10; - else - v = c - '0'; - if ((v & 0xc) == 0x8) - return false; - - return true; - } - else if (long_address[1] == 'c' || long_address[1] == 'd') - { - // fc00::/7 (site local) - return false; - } - } - - return true; - } - else - { - // Assumes address is already a valid IP address - if (address.Left(3) == _T("127") || - address.Left(3) == _T("10.") || - address.Left(7) == _T("192.168") || - address.Left(7) == _T("169.254")) - return false; - - if (address.Left(3) == _T("172")) - { - wxString middle = address.Mid(4); - int pos = address.Find(_T(".")); - wxASSERT(pos != -1); - long part; - middle.Left(pos).ToLong(&part); +#include - if (part >= 16 && part <= 31) - return false; - } - - return true; - } -} - -bool IsIpAddress(const wxString& address) -{ - if (!GetIPV6LongForm(address).empty()) - return true; - - int segment = 0; - int dotcount = 0; - for (size_t i = 0; i < address.Len(); ++i) { - wxChar const c = address[i]; - if (c == '.') { - if (i + 1 < address.Len() && address[i + 1] == '.') { - // Disallow multiple dots in a row - return false; - } - - if (segment > 255) - return false; - if (!dotcount && !segment) - return false; - dotcount++; - segment = 0; - } - else if (c < '0' || c > '9') { - return false; - } - else { - segment = segment * 10 + c - '0'; - } - } - if (dotcount != 3) - return false; - - if (segment > 255) - return false; - - return true; -} - -namespace { -#if defined(__WXMSW__) && !defined(_MSC_VER) -// Unfortunately MiNGW does not have a working random_device -// Implement our own in terms of CryptGenRandom. -// Fall back to time-seeded mersenne twister on error -struct provider -{ - provider() - { - if (!CryptAcquireContextW(&h_, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) { - h_ = 0; - } - mt_.seed(CDateTime::Now().GetTimeT()); - } - ~provider() - { - if (h_) { - CryptReleaseContext(h_, 0); - } - } - - HCRYPTPROV h_{}; - std::mt19937_64 mt_; -}; - -struct working_random_device -{ - typedef uint64_t result_type; - - constexpr static result_type min() { return std::numeric_limits::min(); } - constexpr static result_type max() { return std::numeric_limits::max(); } - - result_type operator()() - { - thread_local provider prov; - - result_type ret{}; - if (!prov.h_ || !CryptGenRandom(prov.h_, sizeof(ret), reinterpret_cast(&ret))) { - ret = prov.mt_(); - } - - return ret; - } -}; - -static_assert(working_random_device::max() == std::mt19937_64::max(), "Unsupported std::mt19937_64::max()"); -static_assert(working_random_device::min() == std::mt19937_64::min(), "Unsupported std::mt19937_64::min()"); -#else -typedef std::random_device working_random_device; -#endif -} - -int GetRandomNumber(int min, int max) -{ - wxASSERT(min <= max); - if (min >= max) - return min; - - std::uniform_int_distribution dist(min, max); - working_random_device rd; - return dist(rd); -} - -void MakeLowerAscii(wxString& str) -{ - for (size_t i = 0; i < str.size(); i++) { - wxChar c = str.GetChar(i); - if (c >= 'A' && c <= 'Z') { - c += 32; - str.SetChar(i, wxUniChar(c)); - } - else if (c == 0x130 || c == 0x131) { - c = 'i'; - str.SetChar(i, wxUniChar(c)); - } - } -} - -void MakeLowerAscii(fzstring& str) -{ - for (size_t i = 0; i < str.size(); i++) { - auto & c = str[i]; - if (c >= 'A' && c <= 'Z') { - c += 32; - } - else if (c == 0x130 || c == 0x131) { - c = 'i'; - } - } -} +#include "tlssocket.h" wxString GetDependencyVersion(dependency::type d) { diff -Nru filezilla-3.14.1/src/engine/mutex.cpp filezilla-3.15.0.2/src/engine/mutex.cpp --- filezilla-3.14.1/src/engine/mutex.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/mutex.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -#include -#include "mutex.h" - -#ifndef __WXMSW__ -#include -#endif - -#ifndef __WXMSW__ -namespace { -// Static initializers for mutex and condition attributes -template -pthread_mutexattr_t* init_mutexattr() -{ - static pthread_mutexattr_t attr; - pthread_mutexattr_init(&attr); - pthread_mutexattr_settype(&attr, type); - return &attr; -} - -pthread_mutexattr_t* get_mutex_attributes(bool recursive) -{ - if (recursive) { - static pthread_mutexattr_t *attr = init_mutexattr(); - return attr; - } - else { - static pthread_mutexattr_t *attr = init_mutexattr(); - return attr; - } -} - -pthread_condattr_t* init_condattr() -{ -#if HAVE_CLOCK_GETTIME && HAVE_DECL_PTHREAD_CONDATTR_SETCLOCK - static pthread_condattr_t attr; - pthread_condattr_init(&attr); - pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); - return &attr; -#else - return 0; -#endif -} -} -#endif - -mutex::mutex(bool recursive) -{ -#ifdef __WXMSW__ - (void)recursive; // Critical sections are always recursive - InitializeCriticalSection(&m_); -#else - pthread_mutex_init(&m_, get_mutex_attributes(recursive)); -#endif -} - -mutex::~mutex() -{ -#ifdef __WXMSW__ - DeleteCriticalSection(&m_); -#else - pthread_mutex_destroy(&m_); -#endif -} - -void mutex::lock() -{ -#ifdef __WXMSW__ - EnterCriticalSection(&m_); -#else - pthread_mutex_lock(&m_); -#endif -} - -void mutex::unlock() -{ -#ifdef __WXMSW__ - LeaveCriticalSection(&m_); -#else - pthread_mutex_unlock(&m_); -#endif -} - - -condition::condition() - : signalled_() -{ -#ifdef __WXMSW__ - InitializeConditionVariable(&cond_); -#else - - static pthread_condattr_t *attr = init_condattr(); - pthread_cond_init(&cond_, attr); -#endif -} - - -condition::~condition() -{ -#ifdef __WXMSW__ -#else - pthread_cond_destroy(&cond_); -#endif -} - -void condition::wait(scoped_lock& l) -{ - while (!signalled_) { -#ifdef __WXMSW__ - SleepConditionVariableCS(&cond_, l.m_, INFINITE); -#else - pthread_cond_wait(&cond_, l.m_); -#endif - } - signalled_ = false; -} - -bool condition::wait(scoped_lock& l, int timeout_ms) -{ - if (signalled_) { - signalled_ = false; - return true; - } -#ifdef __WXMSW__ - bool const success = SleepConditionVariableCS(&cond_, l.m_, timeout_ms) != 0; -#else - int res; - timespec ts; -#if HAVE_CLOCK_GETTIME && HAVE_DECL_PTHREAD_CONDATTR_SETCLOCK - clock_gettime(CLOCK_MONOTONIC, &ts); -#else - timeval tv{}; - gettimeofday(&tv, 0); - ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_usec * 1000; -#endif - - ts.tv_sec += timeout_ms / 1000; - ts.tv_nsec += (timeout_ms % 1000) * 1000 * 1000; - if (ts.tv_nsec > 1000000000ll) { - ++ts.tv_sec; - ts.tv_nsec -= 1000000000ll; - } - - do { - res = pthread_cond_timedwait(&cond_, l.m_, &ts); - } - while (res == EINTR); - bool const success = res == 0; -#endif - if (success) { - signalled_ = false; - } - - return success; -} - - -void condition::signal(scoped_lock &) -{ - if (!signalled_) { - signalled_ = true; -#ifdef __WXMSW__ - WakeConditionVariable(&cond_); -#else - pthread_cond_signal(&cond_); -#endif - } -} diff -Nru filezilla-3.14.1/src/engine/notification.cpp filezilla-3.15.0.2/src/engine/notification.cpp --- filezilla-3.14.1/src/engine/notification.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/notification.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -107,7 +107,7 @@ CCertificate::CCertificate( unsigned char const* rawData, unsigned int len, - CDateTime const& activationTime, CDateTime const& expirationTime, + fz::datetime const& activationTime, fz::datetime const& expirationTime, wxString const& serial, wxString const& pkalgoname, unsigned int bits, wxString const& signalgoname, diff -Nru filezilla-3.14.1/src/engine/pathcache.cpp filezilla-3.15.0.2/src/engine/pathcache.cpp --- filezilla-3.14.1/src/engine/pathcache.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/pathcache.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -11,7 +11,7 @@ void CPathCache::Store(CServer const& server, CServerPath const& target, CServerPath const& source, wxString const& subdir) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); wxASSERT(!target.empty() && !source.empty()); @@ -30,7 +30,7 @@ CServerPath CPathCache::Lookup(CServer const& server, CServerPath const& source, wxString const& subdir) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); const tCacheConstIterator iter = m_cache.find(server); if (iter == m_cache.end()) @@ -61,7 +61,7 @@ void CPathCache::InvalidateServer(CServer const& server) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tCacheIterator iter = m_cache.find(server); if (iter == m_cache.end()) @@ -72,7 +72,7 @@ void CPathCache::InvalidatePath(CServer const& server, CServerPath const& path, wxString const& subdir) { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); tCacheIterator iter = m_cache.find(server); if (iter != m_cache.end()) { @@ -115,6 +115,6 @@ void CPathCache::Clear() { - scoped_lock lock(mutex_); + fz::scoped_lock lock(mutex_); m_cache.clear(); } diff -Nru filezilla-3.14.1/src/engine/pathcache.h filezilla-3.15.0.2/src/engine/pathcache.h --- filezilla-3.14.1/src/engine/pathcache.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/pathcache.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef __PATHCACHE_H__ #define __PATHCACHE_H__ -#include +#include class CPathCache final { @@ -38,7 +38,7 @@ } }; - mutex mutex_; + fz::mutex mutex_; typedef std::map tServerCache; typedef tServerCache::iterator tServerCacheIterator; diff -Nru filezilla-3.14.1/src/engine/proxy.cpp filezilla-3.15.0.2/src/engine/proxy.cpp --- filezilla-3.14.1/src/engine/proxy.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/proxy.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -1,8 +1,22 @@ +#include +#include +#ifdef FZ_WINDOWS + #include + #include + #include +#else + #include +#endif #include #include "engineprivate.h" #include "proxy.h" #include "ControlSocket.h" -#include + +#include + +#ifndef FZ_WINDOWS +#include +#endif enum handshake_state { @@ -17,8 +31,8 @@ socks4_handshake }; -CProxySocket::CProxySocket(CEventHandler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner) - : CEventHandler(pOwner->event_loop_) +CProxySocket::CProxySocket(fz::event_handler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner) + : fz::event_handler(pOwner->event_loop_) , CBackend(pEvtHandler) , m_pSocket(pSocket) , m_pOwner(pOwner) @@ -28,7 +42,7 @@ CProxySocket::~CProxySocket() { - RemoveHandler(); + remove_handler(); if (m_pSocket) m_pSocket->SetEventHandler(0); @@ -137,18 +151,29 @@ } else if (type == SOCKS4) { wxString ip = m_host; - if (!GetIPV6LongForm(m_host).empty()) { + if (!fz::get_ipv6_long_form(m_host.ToStdWstring()).empty()) { m_pOwner->LogMessage(MessageType::Error, _("IPv6 addresses are not supported with SOCKS4 proxy")); return EINVAL; } - if (!IsIpAddress(m_host)) { - wxIPV4address address; - if (!address.Hostname(host)) { + if (fz::get_address_type(m_host.ToStdWstring()) == fz::address_type::unknown) { + addrinfo hints{}; + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + + addrinfo * result{}; + int res = getaddrinfo(host.ToStdString().c_str(), 0, &hints, &result); + if (!res && result) { + if (result->ai_family == AF_INET) { + ip = CSocket::AddressToString(result->ai_addr, result->ai_addrlen, false); + } + freeaddrinfo(result); + } + + if (ip.empty()) { m_pOwner->LogMessage(MessageType::Error, _("Cannot resolve hostname to IPv4 address for use with SOCKS4 proxy.")); return EINVAL; } - ip = address.IPAddress(); } m_pOwner->LogMessage(MessageType::Status, _("SOCKS4 proxy will connect to: %s"), ip); @@ -202,9 +227,9 @@ return EINPROGRESS; } -void CProxySocket::operator()(CEventBase const& ev) +void CProxySocket::operator()(fz::event_base const& ev) { - Dispatch(ev, this, + fz::dispatch(ev, this, &CProxySocket::OnSocketEvent, &CProxySocket::OnHostAddress); } @@ -220,7 +245,7 @@ if (error) { if (m_proxyState == handshake) m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::connection, error); + m_pEvtHandler->send_event(this, SocketEventType::connection, error); } else { m_pOwner->LogMessage(MessageType::Status, _("Connection with proxy established, performing handshake...")); @@ -275,7 +300,7 @@ if (read == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, SocketEventType::close, error); } else m_can_read = false; @@ -283,13 +308,13 @@ } if (!read) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } if (m_pSendBuffer) { m_proxyState = noconn; m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Incoming data before request fully sent")); - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } @@ -301,7 +326,7 @@ if (m_recvBufferPos + read + 1 == m_recvBufferLen) { m_proxyState = noconn; m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Incoming header too large")); - m_pEvtHandler->SendEvent(this, SocketEventType::close, ENOMEM); + m_pEvtHandler->send_event(this, SocketEventType::close, ENOMEM); return; } do_read = read; @@ -313,7 +338,7 @@ if (read != do_read) { m_proxyState = noconn; m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Could not read what got peeked")); - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_recvBufferPos += read; @@ -330,12 +355,12 @@ if (reply.Left(10) != _T("HTTP/1.1 2") && reply.Left(10) != _T("HTTP/1.0 2")) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNRESET); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNRESET); return; } m_proxyState = conn; - m_pEvtHandler->SendEvent(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, SocketEventType::connection, 0); return; } case socks4_handshake: @@ -345,7 +370,7 @@ if (read == -1) { if (read_error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, read_error); + m_pEvtHandler->send_event(this, SocketEventType::close, read_error); } else m_can_read = false; @@ -354,7 +379,7 @@ if (!read) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_recvBufferPos += read; @@ -383,11 +408,11 @@ } m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed: %s"), error); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_proxyState = conn; - m_pEvtHandler->SendEvent(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, SocketEventType::connection, 0); } return; case socks5_method: @@ -403,7 +428,7 @@ if (read == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, SocketEventType::close, error); } else m_can_read = false; @@ -411,7 +436,7 @@ } if (!read) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_recvBufferPos += read; @@ -426,17 +451,17 @@ switch (m_handshakeState) { default: if (m_pRecvBuffer[0] != 5) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _("Unknown SOCKS protocol version: %d"), (int)m_pRecvBuffer[0]); + m_pOwner->LogMessage(MessageType::Error, _("Unknown SOCKS protocol version: %d"), (int)m_pRecvBuffer[0]); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } break; case socks5_auth: if (m_pRecvBuffer[0] != 1) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _("Unknown protocol version of SOCKS Username/Password Authentication subnegotiation: %d"), (int)m_pRecvBuffer[0]); + m_pOwner->LogMessage(MessageType::Error, _("Unknown protocol version of SOCKS Username/Password Authentication subnegotiation: %d"), (int)m_pRecvBuffer[0]); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } break; @@ -458,9 +483,9 @@ m_handshakeState = socks5_auth; break; default: - m_pOwner->LogMessage(MessageType::Debug_Warning, _("No supported SOCKS5 auth method")); + m_pOwner->LogMessage(MessageType::Error, _("No supported SOCKS5 auth method")); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } } @@ -468,9 +493,9 @@ case socks5_auth: if (m_pRecvBuffer[1] != 0) { - m_pOwner->LogMessage(MessageType::Debug_Warning, _("Proxy authentication failed")); + m_pOwner->LogMessage(MessageType::Error, _("Proxy authentication failed")); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_handshakeState = socks5_request; @@ -509,9 +534,9 @@ break; } - m_pOwner->LogMessage(MessageType::Debug_Warning, _("Proxy request failed: %s"), errorMsg); + m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed. Reply from proxy: %s"), errorMsg); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_handshakeState = socks5_request_addrtype; @@ -533,9 +558,9 @@ m_recvBufferLen = 17; break; default: - m_pOwner->LogMessage(MessageType::Debug_Warning, _("Proxy request failed: Unknown address type in CONNECT reply")); + m_pOwner->LogMessage(MessageType::Error, _("Proxy request failed: Unknown address type in CONNECT reply")); m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } m_handshakeState = socks5_request_address; @@ -544,7 +569,7 @@ { // We're done m_proxyState = conn; - m_pEvtHandler->SendEvent(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, SocketEventType::connection, 0); return; } default: @@ -582,37 +607,34 @@ m_pSendBuffer[1] = 1; // CONNECT m_pSendBuffer[2] = 0; // Reserved - if (IsIpAddress(m_host)) { - // Quite ugly - wxString ipv6 = GetIPV6LongForm(m_host); - if (!ipv6.empty()) { - ipv6.Replace(_T(":"), _T("")); - addrlen = 16; - for (int i = 0; i < 16; i++) - m_pSendBuffer[4 + i] = (DigitHexToDecNum(ipv6[i * 2]) << 4) + DigitHexToDecNum(ipv6[i * 2 + 1]); - - m_pSendBuffer[3] = 4; // IPv6 + auto type = fz::get_address_type(m_host.ToStdWstring()); + if (type == fz::address_type::ipv6) { + auto ipv6 = fz::get_ipv6_long_form(m_host.ToStdWstring()); + 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]); } - else { - 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++) + + m_pSendBuffer[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 == '.') { - const wxChar& c = *p; - if (c == '.') - { - i++; - continue; - } - buf[i] *= 10; - buf[i] += c - '0'; + i++; + continue; } + buf[i] *= 10; + buf[i] += c - '0'; + } - addrlen = 4; + addrlen = 4; - m_pSendBuffer[3] = 1; // IPv4 - } + m_pSendBuffer[3] = 1; // IPv4 } else { m_pSendBuffer[3] = 3; // Domain name @@ -644,7 +666,7 @@ default: m_proxyState = noconn; m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unhandled handshake state %d"), m_handshakeState); - m_pEvtHandler->SendEvent(this, SocketEventType::close, ECONNABORTED); + m_pEvtHandler->send_event(this, SocketEventType::close, ECONNABORTED); return; } } @@ -661,7 +683,7 @@ if (written == -1) { if (error != EAGAIN) { m_proxyState = noconn; - m_pEvtHandler->SendEvent(this, SocketEventType::close, error); + m_pEvtHandler->send_event(this, SocketEventType::close, error); } else m_can_write = false; diff -Nru filezilla-3.14.1/src/engine/proxy.h filezilla-3.15.0.2/src/engine/proxy.h --- filezilla-3.14.1/src/engine/proxy.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/proxy.h 2016-02-10 19:27:09.000000000 +0000 @@ -5,10 +5,10 @@ #include "socket.h" class CControlSocket; -class CProxySocket final : protected CEventHandler, public CBackend +class CProxySocket final : protected fz::event_handler, public CBackend { public: - CProxySocket(CEventHandler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner); + CProxySocket(event_handler* pEvtHandler, CSocket* pSocket, CControlSocket* pOwner); virtual ~CProxySocket(); enum ProxyState { @@ -66,7 +66,7 @@ int m_recvBufferPos{}; int m_recvBufferLen{}; - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); void OnHostAddress(CSocketEventSource* source, wxString const& address); diff -Nru filezilla-3.14.1/src/engine/ratelimiter.cpp filezilla-3.15.0.2/src/engine/ratelimiter.cpp --- filezilla-3.14.1/src/engine/ratelimiter.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ratelimiter.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,12 +1,12 @@ #include #include "ratelimiter.h" -#include "event_loop.h" +#include static int const tickDelay = 250; -CRateLimiter::CRateLimiter(CEventLoop& loop, COptionsBase& options) - : CEventHandler(loop) +CRateLimiter::CRateLimiter(fz::event_loop& loop, COptionsBase& options) + : event_handler(loop) , options_(options) { RegisterOption(OPTION_SPEEDLIMIT_ENABLE); @@ -19,7 +19,7 @@ CRateLimiter::~CRateLimiter() { - RemoveHandler(); + remove_handler(); } int64_t CRateLimiter::GetLimit(rate_direction direction) const @@ -34,7 +34,7 @@ void CRateLimiter::AddObject(CRateLimiterObject* pObject) { - scoped_lock lock(sync_); + fz::scoped_lock lock(sync_); m_objectList.push_back(pObject); @@ -58,7 +58,7 @@ pObject->m_bytesAvailable[i] = tokens; if (!m_timer) - m_timer = AddTimer(duration::from_milliseconds(tickDelay), false); + m_timer = add_timer(fz::duration::from_milliseconds(tickDelay), false); } else { pObject->m_bytesAvailable[i] = -1; @@ -68,7 +68,7 @@ void CRateLimiter::RemoveObject(CRateLimiterObject* pObject) { - scoped_lock lock(sync_); + fz::scoped_lock lock(sync_); for (auto iter = m_objectList.begin(); iter != m_objectList.end(); ++iter) { if (*iter == pObject) { @@ -97,9 +97,9 @@ } } -void CRateLimiter::OnTimer(timer_id) +void CRateLimiter::OnTimer(fz::timer_id) { - scoped_lock lock(sync_); + fz::scoped_lock lock(sync_); int64_t const limits[2] = { GetLimit(inbound), GetLimit(outbound) }; @@ -179,13 +179,13 @@ if (m_objectList.empty() || (limits[inbound] == 0 && limits[outbound] == 0)) { if (m_timer) { - StopTimer(m_timer); + stop_timer(m_timer); m_timer = 0; } } } -void CRateLimiter::WakeupWaitingObjects(scoped_lock & l) +void CRateLimiter::WakeupWaitingObjects(fz::scoped_lock & l) { for (int i = 0; i < 2; ++i) { while (!m_wakeupList[i].empty()) { @@ -224,26 +224,25 @@ return bucket_size; } -void CRateLimiter::operator()(CEventBase const& ev) +void CRateLimiter::operator()(fz::event_base const& ev) { - if (Dispatch(ev, this, &CRateLimiter::OnTimer)) { - return; - } - Dispatch(ev, this, &CRateLimiter::OnRateChanged); + fz::dispatch(ev, this, + &CRateLimiter::OnTimer, + &CRateLimiter::OnRateChanged); } void CRateLimiter::OnRateChanged() { - scoped_lock lock(sync_); + fz::scoped_lock lock(sync_); if (GetLimit(inbound) > 0 || GetLimit(outbound) > 0) { if (!m_timer) - m_timer = AddTimer(duration::from_milliseconds(tickDelay), false); + m_timer = add_timer(fz::duration::from_milliseconds(tickDelay), false); } } void CRateLimiter::OnOptionsChanged(changed_options_t const&) { - SendEvent(); + send_event(); } CRateLimiterObject::CRateLimiterObject() diff -Nru filezilla-3.14.1/src/engine/ratelimiter.h filezilla-3.15.0.2/src/engine/ratelimiter.h --- filezilla-3.14.1/src/engine/ratelimiter.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/ratelimiter.h 2016-02-05 08:54:46.000000000 +0000 @@ -8,10 +8,10 @@ class CRateLimiterObject; // This class implements a simple rate limiter based on the Token Bucket algorithm. -class CRateLimiter final : protected CEventHandler, COptionChangeEventHandler +class CRateLimiter final : protected fz::event_handler, COptionChangeEventHandler { public: - CRateLimiter(CEventLoop& loop, COptionsBase& options); + CRateLimiter(fz::event_loop& loop, COptionsBase& options); ~CRateLimiter(); enum rate_direction @@ -31,25 +31,25 @@ std::list m_objectList; std::list m_wakeupList[2]; - timer_id m_timer{}; + fz::timer_id m_timer{}; int64_t m_tokenDebt[2]; COptionsBase& options_; - void WakeupWaitingObjects(scoped_lock & l); + void WakeupWaitingObjects(fz::scoped_lock & l); void OnOptionsChanged(changed_options_t const& options); - void operator()(CEventBase const& ev); - void OnTimer(timer_id id); + void operator()(fz::event_base const& ev); + void OnTimer(fz::timer_id id); void OnRateChanged(); - mutex sync_; + fz::mutex sync_; }; struct ratelimit_changed_event_type{}; -typedef CEvent CRateLimitChangedEvent; +typedef fz::simple_event CRateLimitChangedEvent; class CRateLimiterObject { diff -Nru filezilla-3.14.1/src/engine/rtt.cpp filezilla-3.15.0.2/src/engine/rtt.cpp --- filezilla-3.14.1/src/engine/rtt.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/rtt.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -7,7 +7,7 @@ int CLatencyMeasurement::GetLatency() const { - scoped_lock lock(m_sync); + fz::scoped_lock lock(m_sync); if (!m_measurements) return -1; @@ -16,23 +16,23 @@ bool CLatencyMeasurement::Start() { - scoped_lock lock(m_sync); + fz::scoped_lock lock(m_sync); if (m_start) return false; - m_start = CMonotonicClock::now(); + m_start = fz::monotonic_clock::now(); return true; } bool CLatencyMeasurement::Stop() { - scoped_lock lock(m_sync); + fz::scoped_lock lock(m_sync); if (!m_start) return false; - duration const diff = CMonotonicClock::now() - m_start; - m_start = CMonotonicClock(); + fz::duration const diff = fz::monotonic_clock::now() - m_start; + m_start = fz::monotonic_clock(); if (diff.get_milliseconds() < 0) return false; @@ -45,10 +45,10 @@ void CLatencyMeasurement::Reset() { - scoped_lock lock(m_sync); + fz::scoped_lock lock(m_sync); m_summed_latency = 0; m_measurements = 0; - m_start = CMonotonicClock(); + m_start = fz::monotonic_clock(); } void CLatencyMeasurement::cb() diff -Nru filezilla-3.14.1/src/engine/rtt.h filezilla-3.15.0.2/src/engine/rtt.h --- filezilla-3.14.1/src/engine/rtt.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/rtt.h 2016-02-10 19:27:09.000000000 +0000 @@ -23,12 +23,12 @@ virtual void cb(); protected: - CMonotonicClock m_start; + fz::monotonic_clock m_start; int64_t m_summed_latency{}; int m_measurements{}; - mutable mutex m_sync; + mutable fz::mutex m_sync; }; #endif diff -Nru filezilla-3.14.1/src/engine/sftpcontrolsocket.cpp filezilla-3.15.0.2/src/engine/sftpcontrolsocket.cpp --- filezilla-3.14.1/src/engine/sftpcontrolsocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/sftpcontrolsocket.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -3,14 +3,15 @@ #include "directorycache.h" #include "directorylistingparser.h" #include "engineprivate.h" -#include "event_loop.h" #include "pathcache.h" -#include "local_filesys.h" -#include "fzprocess.h" #include "proxy.h" #include "servercapabilities.h" #include "sftpcontrolsocket.h" +#include +#include +#include + #include #include #include @@ -19,10 +20,10 @@ #define FZSFTP_PROTOCOL_VERSION 4 struct sftp_event_type; -typedef CEvent CSftpEvent; +typedef fz::simple_event CSftpEvent; struct terminate_event_type; -typedef CEvent CTerminateEvent; +typedef fz::simple_event CTerminateEvent; class CSftpFileTransferOpData : public CFileTransferOpData { @@ -54,37 +55,28 @@ }; }; -class CSftpInputThread final : public wxThread +class CSftpInputThread final : public fz::thread { public: - CSftpInputThread(CSftpControlSocket* pOwner, CProcess& process) - : wxThread(wxTHREAD_JOINABLE) - , process_(process) + CSftpInputThread(CSftpControlSocket* pOwner, fz::process& proc) + : process_(proc) , m_pOwner(pOwner) { } virtual ~CSftpInputThread() { - scoped_lock l(m_sync); + join(); + + fz::scoped_lock l(m_sync); for (auto & msg : m_sftpMessages) { delete msg; } } - bool Init() - { - if (Create() != wxTHREAD_NO_ERROR) - return false; - - Run(); - - return true; - } - void GetMessages(std::vector& messages) { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); messages.swap(m_sftpMessages); } @@ -95,13 +87,13 @@ bool sendEvent; { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); sendEvent = m_sftpMessages.empty(); m_sftpMessages.push_back(message); } if (sendEvent) - m_pOwner->SendEvent(); + m_pOwner->send_event(); } int ReadNumber(bool &error) @@ -110,7 +102,7 @@ while(true) { char c; - int read = process_.Read(&c, 1); + int read = process_.read(&c, 1); if (read != 1) { if (!read) m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unexpected EOF.")); @@ -138,7 +130,7 @@ while(true) { char c; - int read = process_.Read(&c, 1); + int read = process_.read(&c, 1); if (read != 1) { if (!read) m_pOwner->LogMessage(MessageType::Debug_Warning, _T("Unexpected EOF.")); @@ -173,12 +165,12 @@ return line; } - virtual ExitCode Entry() + virtual void entry() { bool error = false; while (!error) { char readType = 0; - int read = process_.Read(&readType, 1); + int read = process_.read(&readType, 1); if (read != 1) break; @@ -284,20 +276,14 @@ } loopexit: - m_pOwner->SendEvent(); - return reinterpret_cast(Close()); - } - - int Close() - { - return 0; + m_pOwner->send_event(); } - CProcess& process_; + fz::process& process_; CSftpControlSocket* m_pOwner; std::vector m_sftpMessages; - mutex m_sync; + fz::mutex m_sync; }; class CSftpDeleteOpData final : public COpData @@ -313,9 +299,9 @@ CServerPath path; std::deque files; - // Set to CDateTime::Now initially and after + // Set to fz::datetime::Now initially and after // sending an updated listing to the UI. - CDateTime m_time; + fz::datetime m_time; bool m_needSendListing{}; @@ -331,7 +317,7 @@ CSftpControlSocket::~CSftpControlSocket() { - RemoveHandler(); + remove_handler(); DoClose(); } @@ -405,27 +391,27 @@ else pData->pKeyFiles = pTokenizer; - m_pProcess = new CProcess(); + m_pProcess = new fz::process(); engine_.GetRateLimiter().AddObject(this); - wxString executable = engine_.GetOptions().GetOption(OPTION_FZSFTP_EXECUTABLE); + auto executable = fz::to_native(engine_.GetOptions().GetOption(OPTION_FZSFTP_EXECUTABLE)); if (executable.empty()) - executable = _T("fzsftp"); + executable = fzT("fzsftp"); LogMessage(MessageType::Debug_Verbose, _T("Going to execute %s"), executable); - std::vector args = {_T("-v")}; + std::vector args = {fzT("-v")}; if (engine_.GetOptions().GetOptionVal(OPTION_SFTP_COMPRESSION)) { - args.push_back(_T("-C")); + args.push_back(fzT("-C")); } - if (!m_pProcess->Execute(executable, args)) { + 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->Init()) { + if (!m_pInputThread->run()) { LogMessage(MessageType::Debug_Warning, _T("Thread creation failed")); delete m_pInputThread; m_pInputThread = 0; @@ -804,7 +790,7 @@ } unsigned int len = strlen(str); - return m_pProcess->Write(str, len); + return m_pProcess->write(str, len); } bool CSftpControlSocket::SetAsyncRequestReply(CAsyncRequestNotification *pNotification) @@ -1029,11 +1015,11 @@ seconds += c - '0'; } if (parsed) { - CDateTime date(seconds, CDateTime::seconds); - if (date.IsValid()) { + fz::datetime date(seconds, fz::datetime::seconds); + if (date.empty()) { wxASSERT(pData->directoryListing[pData->mtime_index].has_date()); - CDateTime listTime = pData->directoryListing[pData->mtime_index].time; - listTime -= duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); + 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()) { @@ -1045,7 +1031,7 @@ LogMessage(MessageType::Status, _("Timezone offset of server is %d seconds."), -serveroffset); - duration span = duration::from_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]; @@ -1596,7 +1582,7 @@ int64_t size; bool isLink; - if (CLocalFileSystem::GetFileInfo(pData->localFile, isLink, &size, 0, 0) == CLocalFileSystem::file) + 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; @@ -1800,7 +1786,7 @@ } else if (pData->opState == filetransfer_chmtime) { - wxASSERT(pData->fileTime.IsValid()); + wxASSERT(pData->fileTime.empty()); if (pData->download) { LogMessage(__TFILE__, __LINE__, this, MessageType::Debug_Info, _T(" filetransfer_chmtime during download")); @@ -1810,7 +1796,7 @@ wxString quotedFilename = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath)); // Y2K38 - time_t ticks = pData->fileTime.GetTimeT(); + 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)) @@ -1840,14 +1826,14 @@ if (engine_.GetOptions().GetOptionVal(OPTION_PRESERVE_TIMESTAMPS)) { if (pData->download) { - if (pData->fileTime.IsValid()) { - if (!CLocalFileSystem::SetModificationTime(pData->localFile, pData->fileTime)) + 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 = CLocalFileSystem::GetModificationTime(pData->localFile); - if (pData->fileTime.IsValid()) { + pData->fileTime = fz::local_filesys::get_modification_time(fz::to_native(pData->localFile)); + if (pData->fileTime.empty()) { pData->opState = filetransfer_chmtime; return SendNextCommand(); } @@ -1868,10 +1854,10 @@ seconds += c - '0'; } if (parsed) { - CDateTime fileTime = CDateTime(seconds, CDateTime::seconds); - if (fileTime.IsValid()) { + fz::datetime fileTime = fz::datetime(seconds, fz::datetime::seconds); + if (fileTime.empty()) { pData->fileTime = fileTime; - pData->fileTime += duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); + pData->fileTime += fz::duration::from_minutes(m_pCurrentServer->GetTimezoneOffset()); } } } @@ -1904,17 +1890,13 @@ engine_.GetRateLimiter().RemoveObject(this); if (m_pProcess) { - m_pProcess->Kill(); + m_pProcess->kill(); } if (m_pInputThread) { - wxThread* pThread = m_pInputThread; + auto thread = m_pInputThread; m_pInputThread = 0; - - if (pThread) { - pThread->Wait(wxTHREAD_WAIT_BLOCK); - delete pThread; - } + delete thread; } if (m_pProcess) { delete m_pProcess; @@ -2151,8 +2133,8 @@ engine_.GetDirectoryCache().RemoveFile(*m_pCurrentServer, pData->path, file); - auto const now = CDateTime::Now(); - if (now.IsValid() && pData->m_time.IsValid() && (now - pData->m_time).get_seconds() >= 1) { + 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; @@ -2194,8 +2176,8 @@ return FZ_REPLY_ERROR; } - if (!pData->m_time.IsValid()) - pData->m_time = CDateTime::Now(); + if (!pData->m_time.empty()) + pData->m_time = fz::datetime::now(); engine_.GetDirectoryCache().InvalidateFile(*m_pCurrentServer, pData->path, file); @@ -2657,9 +2639,9 @@ return FZ_REPLY_OK; } -void CSftpControlSocket::operator()(CEventBase const& ev) +void CSftpControlSocket::operator()(fz::event_base const& ev) { - if (Dispatch(ev, this, + if (fz::dispatch(ev, this, &CSftpControlSocket::OnSftpEvent, &CSftpControlSocket::OnTerminate)) { return; diff -Nru filezilla-3.14.1/src/engine/sftpcontrolsocket.h filezilla-3.15.0.2/src/engine/sftpcontrolsocket.h --- filezilla-3.14.1/src/engine/sftpcontrolsocket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/sftpcontrolsocket.h 2016-02-05 08:54:46.000000000 +0000 @@ -40,7 +40,10 @@ sftpReqUnknown }; -class CProcess; +namespace fz { +class process; +} + class CSftpInputThread; class CSftpControlSocket final : public CControlSocket, public CRateLimiterObject @@ -122,10 +125,10 @@ // see src/putty/wildcard.c wxString WildcardEscape(const wxString& file); - CProcess* m_pProcess{}; + fz::process* m_pProcess{}; CSftpInputThread* m_pInputThread{}; - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnSftpEvent(); void OnTerminate(); diff -Nru filezilla-3.14.1/src/engine/socket.cpp filezilla-3.15.0.2/src/engine/socket.cpp --- filezilla-3.14.1/src/engine/socket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/socket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -1,24 +1,14 @@ #include -#ifdef __WXMSW__ - #ifndef NOMINMAX - #define NOMINMAX - #endif - // MinGW needs this for getaddrinfo - #if defined(_WIN32_WINNT) - #if _WIN32_WINNT < 0x0600 - #undef _WIN32_WINNT - #define _WIN32_WINNT 0x0600 - #endif - #else - #define _WIN32_WINNT 0x0600 - #endif +#include +#ifdef FZ_WINDOWS + #include #include #include #endif #include -#include "mutex.h" +#include #include "socket.h" -#ifndef __WXMSW__ +#ifndef FZ_WINDOWS #define mutex mutex_override // Sadly on some platforms system headers include conflicting names #include #include @@ -60,17 +50,15 @@ #define WAIT_EVENTCOUNT 5 class CSocketThread; + namespace { static std::vector waiting_socket_threads; -static mutex waiting_socket_threads_mutex{false}; -}; - -struct socket_event_type; -typedef CEvent CInternalSocketEvent; +static fz::mutex waiting_socket_threads_mutex{ false }; +} -void RemoveSocketEvents(CEventHandler * handler, CSocketEventSource const* const source) +void RemoveSocketEvents(fz::event_handler * handler, CSocketEventSource const* const source) { - auto socketEventFilter = [&](CEventLoop::Events::value_type const& ev) -> bool { + auto socketEventFilter = [&](fz::event_loop::Events::value_type const& ev) -> bool { if (ev.first != handler) { return false; } @@ -83,10 +71,10 @@ return false; }; - handler->event_loop_.FilterEvents(socketEventFilter); + handler->event_loop_.filter_events(socketEventFilter); } -void ChangeSocketEventHandler(CEventHandler * oldHandler, CEventHandler * newHandler, CSocketEventSource const* const source) +void ChangeSocketEventHandler(fz::event_handler * oldHandler, fz::event_handler * newHandler, CSocketEventSource const* const source) { if (!oldHandler) return; @@ -98,7 +86,7 @@ RemoveSocketEvents(oldHandler, source); } else { - auto socketEventFilter = [&](CEventLoop::Events::value_type & ev) -> bool { + 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) { @@ -114,12 +102,12 @@ return false; }; - oldHandler->event_loop_.FilterEvents(socketEventFilter); + oldHandler->event_loop_.filter_events(socketEventFilter); } } namespace { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS static int ConvertMSWErrorCode(int error) { switch (error) @@ -187,7 +175,7 @@ 0 }; for (int i = 0; errors[i]; ++i) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS int code = ConvertMSWErrorCode(errors[i]); #else int code = errors[i]; @@ -201,14 +189,14 @@ #endif } -class CSocketThread final : protected wxThread +class CSocketThread final : protected fz::thread { friend class CSocket; public: CSocketThread() - : wxThread(wxTHREAD_JOINABLE), m_sync(false) + : m_sync(false) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS m_sync_event = WSA_INVALID_EVENT; #else m_pipe[0] = -1; @@ -221,7 +209,8 @@ virtual ~CSocketThread() { -#ifdef __WXMSW__ + join(); +#ifdef FZ_WINDOWS if (m_sync_event != WSA_INVALID_EVENT) WSACloseEvent(m_sync_event); #else @@ -234,11 +223,11 @@ void SetSocket(CSocket* pSocket) { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); SetSocket(pSocket, l); } - void SetSocket(CSocket* pSocket, scoped_lock const&) + void SetSocket(CSocket* pSocket, fz::scoped_lock const&) { m_pSocket = pSocket; @@ -277,14 +266,14 @@ int Start() { if (m_started) { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); wxASSERT(m_threadwait); m_waiting = 0; WakeupThread(l); return 0; } m_started = true; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS if (m_sync_event == WSA_INVALID_EVENT) m_sync_event = WSACreateEvent(); if (m_sync_event == WSA_INVALID_EVENT) @@ -296,11 +285,9 @@ } #endif - int res = Create(); - if (res != wxTHREAD_NO_ERROR) + if (!run()) { return 1; - - Run(); + } return 0; } @@ -308,11 +295,11 @@ // Cancels select or idle wait void WakeupThread() { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); WakeupThread(l); } - void WakeupThread(scoped_lock & l) + void WakeupThread(fz::scoped_lock & l) { if (!m_started || m_finished) { return; @@ -324,7 +311,7 @@ return; } -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS WSASetEvent(m_sync_event); #else char tmp = 0; @@ -340,7 +327,7 @@ static int CreateSocketFd(addrinfo const& addr) { int fd; -#if defined(SOCK_CLOEXEC) && !defined(__WXMSW__) +#if defined(SOCK_CLOEXEC) && !defined(FZ_WINDOWS) fd = socket(addr.ai_family, addr.ai_socktype | SOCK_CLOEXEC, addr.ai_protocol); if (fd == -1 && errno == EINVAL) #endif @@ -363,7 +350,7 @@ static void CloseSocketFd(int& fd) { if (fd != -1) { - #ifdef __WXMSW__ + #ifdef FZ_WINDOWS closesocket(fd); #else close(fd); @@ -372,16 +359,16 @@ } } - int TryConnectHost(addrinfo & addr, sockaddr_u const& bindAddr, scoped_lock & l) + int TryConnectHost(addrinfo & addr, sockaddr_u const& bindAddr, fz::scoped_lock & l) { if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, CSocket::AddressToString(addr.ai_addr, addr.ai_addrlen)); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, CSocket::AddressToString(addr.ai_addr, addr.ai_addrlen)); } int fd = CreateSocketFd(addr); if (fd == -1) { if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, GetLastSocketError()); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, GetLastSocketError()); } return 0; @@ -396,13 +383,13 @@ int res = connect(fd, addr.ai_addr, addr.ai_addrlen); if (res == -1) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // Map to POSIX error codes int error = WSAGetLastError(); if (error == WSAEWOULDBLOCK) res = EINPROGRESS; else - res = ConvertMSWErrorCode(WSAGetLastError()); + res = GetLastSocketError(); #else res = errno; #endif @@ -432,7 +419,7 @@ if (res) { if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, res); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, addr.ai_next ? SocketEventType::connection_next : SocketEventType::connection, res); } CloseSocketFd(fd); @@ -443,7 +430,7 @@ m_pSocket->m_state = CSocket::connected; if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::connection, 0); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, 0); } // We're now interested in all the other nice events @@ -456,7 +443,7 @@ } // Only call while locked - bool DoConnect(scoped_lock & l) + bool DoConnect(fz::scoped_lock & l) { if (m_host.empty() || m_port.empty()) { m_pSocket->m_state = CSocket::closed; @@ -519,12 +506,12 @@ } if (res) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS res = ConvertMSWErrorCode(res); #endif if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::connection, res); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, res); } m_pSocket->m_state = CSocket::closed; @@ -547,7 +534,7 @@ freeaddrinfo(addressList); if (m_pSocket->m_pEvtHandler) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::connection, ECONNABORTED); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, ECONNABORTED); } m_pSocket->m_state = CSocket::closed; @@ -560,12 +547,12 @@ } // Call only while locked - bool DoWait(int wait, scoped_lock & l) + bool DoWait(int wait, fz::scoped_lock & l) { m_waiting |= wait; for (;;) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS int wait_events = FD_CLOSE; if (m_waiting & WAIT_CONNECT) wait_events |= FD_CONNECT; @@ -589,7 +576,7 @@ WSANETWORKEVENTS events; int res = WSAEnumNetworkEvents(m_pSocket->m_fd, m_sync_event, &events); if (res) { - res = ConvertMSWErrorCode(WSAGetLastError()); + res = GetLastSocketError(); return false; } @@ -719,15 +706,15 @@ if (m_triggered & WAIT_READ) { if (m_pSocket->m_synchronous_read_cb) m_pSocket->m_synchronous_read_cb->cb(); - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::read, m_triggered_errors[1]); + 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->SendEvent(m_pSocket, SocketEventType::write, m_triggered_errors[2]); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::write, m_triggered_errors[2]); m_triggered &= ~WAIT_WRITE; } if (m_triggered & WAIT_ACCEPT) { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::connection, m_triggered_errors[3]); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::connection, m_triggered_errors[3]); m_triggered &= ~WAIT_ACCEPT; } if (m_triggered & WAIT_CLOSE) { @@ -741,7 +728,7 @@ return; } -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // MSDN says this: // FD_CLOSE being posted after all data is read from a socket. // An application should check for remaining data upon receipt @@ -752,18 +739,18 @@ if( !(m_waiting & WAIT_READ) ) { return; } - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::read, 0); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::read, 0); } else #endif { - m_pSocket->m_pEvtHandler->SendEvent(m_pSocket, SocketEventType::close, m_triggered_errors[4]); + m_pSocket->m_pEvtHandler->send_event(m_pSocket, SocketEventType::close, m_triggered_errors[4]); m_triggered &= ~WAIT_CLOSE; } } // Call only while locked - bool IdleLoop(scoped_lock & l) + bool IdleLoop(fz::scoped_lock & l) { if (m_quit) return false; @@ -778,13 +765,13 @@ return true; } - virtual ExitCode Entry() + virtual void entry() { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); for (;;) { if (!IdleLoop(l)) { m_finished = true; - return 0; + return; } if (m_pSocket->m_state == CSocket::listening) { @@ -804,7 +791,7 @@ continue; } -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS m_waiting |= WAIT_CLOSE; int wait_close = WAIT_CLOSE; #endif @@ -817,7 +804,7 @@ if (m_triggered & WAIT_CLOSE && m_pSocket) { m_pSocket->m_state = CSocket::closing; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS wait_close = 0; #endif } @@ -826,7 +813,7 @@ break; SendEvents(); -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS m_waiting |= wait_close; #endif } @@ -834,7 +821,7 @@ } m_finished = true; - return 0; + return; } CSocket* m_pSocket{}; @@ -843,7 +830,7 @@ std::string m_port; std::string m_bind; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS // We wait on this using WSAWaitForMultipleEvents WSAEVENT m_sync_event; #else @@ -851,8 +838,8 @@ int m_pipe[2]; #endif - mutex m_sync; - condition m_condition; + fz::mutex m_sync; + fz::condition m_condition; bool m_started{}; bool m_quit{}; @@ -869,7 +856,7 @@ bool m_threadwait{}; }; -CSocket::CSocket(CEventHandler* pEvtHandler) +CSocket::CSocket(fz::event_handler* pEvtHandler) : m_pEvtHandler(pEvtHandler) { #ifdef ERRORCODETEST @@ -900,12 +887,11 @@ if (!m_pSocketThread) return; - scoped_lock l(m_pSocketThread->m_sync); + fz::scoped_lock l(m_pSocketThread->m_sync); m_pSocketThread->SetSocket(0, l); if (m_pSocketThread->m_finished) { m_pSocketThread->WakeupThread(l); l.unlock(); - m_pSocketThread->Wait(); delete m_pSocketThread; } else { @@ -918,7 +904,7 @@ m_pSocketThread->WakeupThread(l); l.unlock(); - scoped_lock wl(waiting_socket_threads_mutex); + fz::scoped_lock wl(waiting_socket_threads_mutex); waiting_socket_threads.push_back(m_pSocketThread); } } @@ -951,7 +937,7 @@ } if (m_pSocketThread && m_pSocketThread->m_started) { - scoped_lock l(m_pSocketThread->m_sync); + fz::scoped_lock l(m_pSocketThread->m_sync); if (!m_pSocketThread->m_threadwait) { m_pSocketThread->WakeupThread(l); l.unlock(); @@ -986,10 +972,10 @@ return EINPROGRESS; } -void CSocket::SetEventHandler(CEventHandler* pEvtHandler) +void CSocket::SetEventHandler(fz::event_handler* pEvtHandler) { if (m_pSocketThread) { - scoped_lock l(m_pSocketThread->m_sync); + fz::scoped_lock l(m_pSocketThread->m_sync); if (m_pEvtHandler == pEvtHandler) { return; @@ -1000,16 +986,16 @@ m_pEvtHandler = pEvtHandler; if (pEvtHandler && m_state == connected) { -#ifdef __WXMSW__ +#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->SendEvent(this, SocketEventType::write, 0); + pEvtHandler->send_event(this, SocketEventType::write, 0); } - pEvtHandler->SendEvent(this, SocketEventType::read, 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); @@ -1104,7 +1090,7 @@ #endif // Codes that have no POSIX equivalence -#ifdef __WXMSW__ +#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")) @@ -1144,7 +1130,7 @@ int CSocket::Close() { if (m_pSocketThread) { - scoped_lock l(m_pSocketThread->m_sync); + fz::scoped_lock l(m_pSocketThread->m_sync); int fd = m_fd; m_fd = -1; @@ -1195,19 +1181,18 @@ void CSocket::Cleanup(bool force) { - scoped_lock wl(waiting_socket_threads_mutex); + 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) { - scoped_lock l(pThread->m_sync); + fz::scoped_lock l(pThread->m_sync); if (!pThread->m_finished) { break; } } - pThread->Wait(wxTHREAD_WAIT_BLOCK); delete pThread; } waiting_socket_threads.erase(waiting_socket_threads.begin(), iter); @@ -1221,7 +1206,7 @@ error = GetLastSocketError(); if (error == EAGAIN) { if (m_pSocketThread) { - scoped_lock l(m_pSocketThread->m_sync); + 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); @@ -1255,10 +1240,10 @@ #else const int flags = 0; -#if !defined(SO_NOSIGPIPE) && !defined(__WXMSW__) +#if !defined(SO_NOSIGPIPE) && !defined(FZ_WINDOWS) // Some systems have neither. Need to block signal struct sigaction old_action; - struct sigaction action = {0}; + struct sigaction action = {}; action.sa_handler = SIG_IGN; int signal_set = sigaction(SIGPIPE, &action, &old_action); #endif @@ -1267,7 +1252,7 @@ int res = send(m_fd, (const char*)buffer, size, flags); -#if !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE) && !defined(__WXMSW__) +#if !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE) && !defined(FZ_WINDOWS) // Restore previous signal handler if (!signal_set) sigaction(SIGPIPE, &old_action, 0); @@ -1277,7 +1262,7 @@ error = GetLastSocketError(); if (error == EAGAIN) { if (m_pSocketThread) { - scoped_lock l (m_pSocketThread->m_sync); + 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); @@ -1406,7 +1391,7 @@ } { - struct addrinfo hints = {0}; + struct addrinfo hints = {}; hints.ai_family = m_family; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; @@ -1422,7 +1407,7 @@ int res = getaddrinfo(0, portstring, &hints, &addressList); if (res) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS return ConvertMSWErrorCode(res); #else return res; @@ -1474,7 +1459,7 @@ socklen_t addr_len = sizeof(addr); error = getsockname(m_fd, &addr.sockaddr, &addr_len); if (error) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS error = ConvertMSWErrorCode(error); #endif return -1; @@ -1496,7 +1481,7 @@ error = getpeername(m_fd, &addr.sockaddr, &addr_len); if (error) { -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS error = ConvertMSWErrorCode(error); #endif return -1; @@ -1514,7 +1499,7 @@ CSocket* CSocket::Accept(int &error) { if (m_pSocketThread) { - scoped_lock l(m_pSocketThread->m_sync); + fz::scoped_lock l(m_pSocketThread->m_sync); m_pSocketThread->m_waiting |= WAIT_ACCEPT; m_pSocketThread->WakeupThread(l); } @@ -1548,7 +1533,7 @@ int CSocket::SetNonblocking(int fd) { // Set socket to non-blocking. -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS unsigned long nonblock = 1; int res = ioctlsocket(fd, FIONBIO, &nonblock); if (!res) diff -Nru filezilla-3.14.1/src/engine/timeex.cpp filezilla-3.15.0.2/src/engine/timeex.cpp --- filezilla-3.14.1/src/engine/timeex.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/timeex.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,731 +0,0 @@ -#include -#include "timeex.h" - -#ifndef __WXMSW__ -#include -#endif - -#define TIME_ASSERT(x) //wxASSERT(x) - -CDateTime::CDateTime(Zone z, int year, int month, int day, int hour, int minute, int second, int millisecond) -{ - Set(z, year, month, day, hour, minute, second, millisecond); -} - -CDateTime::CDateTime(time_t t, Accuracy a) - : t_(static_cast(t) * 1000) - , a_(a) -{ - TIME_ASSERT(IsClamped()); - TIME_ASSERT(a != milliseconds); -} - -namespace { -void skip(wxChar const*& it, const wxChar* const end) -{ - while (it != end && (*it < '0' || *it > '9')) { - ++it; - } -} - -template -bool parse(wxChar const*& it, wxChar const* end, int count, T & v, int offset) -{ - skip(it, end); - - if (end - it < count) { - return false; - } - - T w = 0; - - wxChar const* const stop = it + count; - while (it != stop) { - if (*it < '0' || *it > '9') { - return false; - } - w *= 10; - w += *it - '0'; - ++it; - } - - w += offset; - - v = w; - return true; -} -} - -CDateTime::CDateTime(wxString const& str, Zone z) -{ - Set(str, z); -} - -CDateTime CDateTime::Now() -{ -#ifdef __WXMSW__ - FILETIME ft{}; - GetSystemTimeAsFileTime(&ft); - return CDateTime(ft, milliseconds); -#else - CDateTime ret; - timeval tv = { 0, 0 }; - if (gettimeofday(&tv, 0) == 0) { - ret.t_ = static_cast(tv.tv_sec) * 1000 + tv.tv_usec / 1000; - ret.a_ = milliseconds; - } - return ret; -#endif -} - -bool CDateTime::operator<(CDateTime const& op) const -{ - if (t_ == invalid) { - return op.t_ != invalid; - } - else if (op.t_ == invalid) { - return false; - } - - if (t_ < op.t_) { - return true; - } - if (t_ > op.t_) { - return false; - } - - return a_ < op.a_; -} - -bool CDateTime::operator<=(CDateTime const& op) const -{ - if (t_ == invalid) { - return true; - } - else if (op.t_ == invalid) { - return false; - } - - if (t_ < op.t_) { - return true; - } - if (t_ > op.t_) { - return false; - } - - return a_ <= op.a_; -} - -bool CDateTime::operator==(CDateTime const& op) const -{ - return t_ == op.t_ && a_ == op.a_; -} - -bool CDateTime::IsClamped() -{ - bool ret = true; - tm t = GetTm(utc); - if (a_ < milliseconds && GetMilliseconds() != 0) { - ret = false; - } - else if (a_ < seconds && t.tm_sec) { - ret = false; - } - else if (a_ < minutes && t.tm_min) { - ret = false; - } - else if (a_ < hours && t.tm_hour) { - ret = false; - } - return ret; -} - -int CDateTime::Compare(CDateTime const& op) const -{ - if (t_ == invalid) { - return (op.t_ == invalid) ? 0 : -1; - } - else if (op.t_ == invalid) { - return 1; - } - - if (a_ == op.a_) { - // First fast path: Same accuracy - int ret = 0; - if (t_ < op.t_) { - ret = -1; - } - else if (t_ > op.t_) { - ret = 1; - } - TIME_ASSERT(CompareSlow(op) == ret); - return ret; - } - - // Second fast path: Lots of difference, at least 2 days - int64_t diff = t_ - op.t_; - if (diff > 60 * 60 * 24 * 1000 * 2) { - TIME_ASSERT(CompareSlow(op) == 1); - return 1; - } - else if (diff < -60 * 60 * 24 * 1000 * 2) { - TIME_ASSERT(CompareSlow(op) == -1); - return -1; - } - - return CompareSlow(op); -} - -int CDateTime::CompareSlow(CDateTime const& op) const -{ - tm t1 = GetTm(utc); - tm t2 = op.GetTm(utc); - if (t1.tm_year < t2.tm_year) { - return -1; - } - else if (t1.tm_year > t2.tm_year) { - return 1; - } - if (t1.tm_mon < t2.tm_mon) { - return -1; - } - else if (t1.tm_mon > t2.tm_mon) { - return 1; - } - if (t1.tm_mday < t2.tm_mday) { - return -1; - } - else if (t1.tm_mday > t2.tm_mday) { - return 1; - } - - Accuracy a = (a_ < op.a_ ) ? a_ : op.a_; - - if (a < hours) { - return 0; - } - if (t1.tm_hour < t2.tm_hour) { - return -1; - } - else if (t1.tm_hour > t2.tm_hour) { - return 1; - } - - if (a < minutes) { - return 0; - } - if (t1.tm_min < t2.tm_min) { - return -1; - } - else if (t1.tm_min > t2.tm_min) { - return 1; - } - - if (a < seconds) { - return 0; - } - if (t1.tm_sec < t2.tm_sec) { - return -1; - } - else if (t1.tm_sec > t2.tm_sec) { - return 1; - } - - if (a < milliseconds) { - return 0; - } - auto ms1 = GetMilliseconds(); - auto ms2 = op.GetMilliseconds(); - if (ms1 < ms2) { - return -1; - } - else if (ms1 > ms2) { - return 1; - } - - return 0; -} - -CDateTime& CDateTime::operator+=(duration const& op) -{ - if (IsValid()) { - if (a_ < hours) { - t_ += op.get_days() * 24 * 3600 * 1000; - } - else if (a_ < minutes) { - t_ += op.get_hours() * 3600 * 1000; - } - else if (a_ < seconds) { - t_ += op.get_minutes() * 60 * 1000; - } - else if (a_ < milliseconds) { - t_ += op.get_seconds() * 1000; - } - else { - t_ += op.get_milliseconds(); - } - } - return *this; -} - -CDateTime& CDateTime::operator-=(duration const& op) -{ - *this += -op; - return *this; -} - -bool CDateTime::Set(Zone z, int year, int month, int day, int hour, int minute, int second, int millisecond) -{ - Accuracy a; - if (hour == -1) { - a = days; - TIME_ASSERT(minute == -1); - TIME_ASSERT(second == -1); - TIME_ASSERT(millisecond == -1); - hour = minute = second = millisecond = 0; - } - else if (minute == -1) { - a = hours; - TIME_ASSERT(second == -1); - TIME_ASSERT(millisecond == -1); - minute = second = millisecond = 0; - } - else if (second == -1) { - a = minutes; - TIME_ASSERT(millisecond == -1); - second = millisecond = 0; - } - else if (millisecond == -1) { - a = seconds; - millisecond = 0; - } - else { - a = milliseconds; - } - -#ifdef __WXMSW__ - SYSTEMTIME st{}; - st.wYear = year; - st.wMonth = month; - st.wDay = day; - st.wHour = hour; - st.wMinute = minute; - st.wSecond = second; - st.wMilliseconds = millisecond; - - return Set(st, a, z); -#else - - tm t{}; - t.tm_isdst = -1; - t.tm_year = year - 1900; - t.tm_mon = month - 1; - t.tm_mday = day; - t.tm_hour = hour; - t.tm_min = minute; - t.tm_sec = second; - - bool set = Set(t, a, z); - - if (set) { - t_ += millisecond; - } - - return set; -#endif -} - -bool CDateTime::Set(wxString const& str, Zone z) -{ - wxChar const* it = str.c_str(); - wxChar const* end = it + str.size(); - -#ifdef __WXMSW__ - SYSTEMTIME st{}; - if (!parse(it, end, 4, st.wYear, 0) || - !parse(it, end, 2, st.wMonth, 0) || - !parse(it, end, 2, st.wDay, 0)) - { - clear(); - return false; - } - - Accuracy a = days; - if (parse(it, end, 2, st.wHour, 0)) { - a = hours; - if (parse(it, end, 2, st.wMinute, 0)) { - a = minutes; - if (parse(it, end, 2, st.wSecond, 0)) { - a = seconds; - if (parse(it, end, 3, st.wMilliseconds, 0)) { - a = milliseconds; - } - } - } - } - return Set(st, a, z); -#else - tm t{}; - if (!parse(it, end, 4, t.tm_year, -1900) || - !parse(it, end, 2, t.tm_mon, -1) || - !parse(it, end, 2, t.tm_mday, 0)) - { - clear(); - return false; - } - - Accuracy a = days; - int64_t ms{}; - if (parse(it, end, 2, t.tm_hour, 0)) { - a = hours; - if (parse(it, end, 2, t.tm_min, 0)) { - a = minutes; - if (parse(it, end, 2, t.tm_sec, 0)) { - a = seconds; - if (parse(it, end, 3, ms, 0)) { - a = milliseconds; - } - } - } - } - bool set = Set(t, a, z); - if (set) { - t_ += ms; - } - return set; -#endif -} - -#ifdef __WXMSW__ - -bool CDateTime::Set(SYSTEMTIME const& st, Accuracy a, Zone z) -{ - clear(); - - FILETIME ft{}; - if (a >= hours && z == local) { - SYSTEMTIME st2{}; - if (!TzSpecificLocalTimeToSystemTime(0, &st, &st2)) { - return false; - } - if (!SystemTimeToFileTime(&st2, &ft)) { - return false; - } - } - else if (!SystemTimeToFileTime(&st, &ft)) { - return false; - } - return Set(ft, a); -} - -namespace { -template -int64_t make_int64_t(T hi, T lo) -{ - return (static_cast(hi) << 32) + static_cast(lo); -} - -// This is the offset between FILETIME epoch in 100ns and the Unix epoch in ms. -int64_t const EPOCH_OFFSET_IN_MSEC = 11644473600000ll; -} - -bool CDateTime::Set(FILETIME const& ft, Accuracy a) -{ - if (ft.dwHighDateTime || ft.dwLowDateTime) { - // See http://trac.wxwidgets.org/changeset/74423 and http://trac.wxwidgets.org/ticket/13098 - // Directly converting to time_t - - int64_t t = make_int64_t(ft.dwHighDateTime, ft.dwLowDateTime); - t /= 10000; // Convert hundreds of nanoseconds to milliseconds. - t -= EPOCH_OFFSET_IN_MSEC; - if (t != invalid) { - t_ = t; - a_ = a; - TIME_ASSERT(IsClamped()); - return true; - } - } - clear(); - return false; -} - -#else - -bool CDateTime::Set(tm& t, Accuracy a, Zone z) -{ - time_t tt; - - errno = 0; - - if (a >= hours && z == local) { - tt = mktime(&t); - } - else { - tt = timegm(&t); - } - - if (tt != time_t(-1) || !errno) { - t_ = static_cast(tt) * 1000; - a_ = a; - - TIME_ASSERT(IsClamped()); - - return true; - } - - clear(); - return false; -} - -#endif - -bool CDateTime::ImbueTime(int hour, int minute, int second, int millisecond) -{ - if (!IsValid() || a_ > days) { - return false; - } - - if (second == -1) { - a_ = minutes; - TIME_ASSERT(millisecond == -1); - second = millisecond = 0; - } - else if (millisecond == -1) { - a_ = seconds; - millisecond = 0; - } - else { - a_ = milliseconds; - } - - if (hour < 0 || hour >= 24) { - return false; - } - if (minute < 0 || minute >= 60) { - return false; - } - if (second < 0 || second >= 60) { - return false; - } - if (millisecond < 0 || millisecond >= 1000) { - return false; - } - - t_ += (hour * 3600 + minute * 60 + second) * 1000 + millisecond; - return true; -} - -bool CDateTime::IsValid() const -{ - return t_ != invalid; -} - -void CDateTime::clear() -{ - a_ = days; - t_ = invalid; -} - -#ifdef __VISUALC__ - -#include - -namespace { - -// Sadly wcsftime has shitty error handling, instead of returning 0 and setting errrno, it invokes some crt debug machinary. -// Fortunately we don't build the official FZ binaries with Visual Studio. -extern "C" void NullInvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t) -{ -} - -struct CrtAssertSuppressor -{ - CrtAssertSuppressor() - { - scoped_lock l(m_); - - if (!refs_++) { - oldError = _CrtSetReportMode(_CRT_ERROR, 0); - oldAssert = _CrtSetReportMode(_CRT_ASSERT, 0); - oldHandler = _set_invalid_parameter_handler(NullInvalidParameterHandler); - } - } - - ~CrtAssertSuppressor() - { - scoped_lock l(m_); - - if (!--refs_) { - _set_invalid_parameter_handler(oldHandler); - _CrtSetReportMode(_CRT_ASSERT, oldAssert); - _CrtSetReportMode(_CRT_ERROR, oldError); - } - } - - static int oldError; - static int oldAssert; - static _invalid_parameter_handler oldHandler; - - static mutex m_; - static int refs_; -}; - -int CrtAssertSuppressor::oldError{}; -int CrtAssertSuppressor::oldAssert{}; -_invalid_parameter_handler CrtAssertSuppressor::oldHandler{}; - -mutex CrtAssertSuppressor::m_{}; -int CrtAssertSuppressor::refs_{}; - -} -#endif - -bool CDateTime::VerifyFormat(wxString const& fmt) -{ - wxChar buf[4096]; - tm t = CDateTime::Now().GetTm(utc); - -#ifdef __VISUALC__ - CrtAssertSuppressor suppressor; -#endif - - return wxStrftime(buf, sizeof(buf)/sizeof(wxChar), fmt, &t) != 0; -} - -duration operator-(CDateTime const& a, CDateTime const& b) -{ - TIME_ASSERT(a.IsValid()); - TIME_ASSERT(b.IsValid()); - - return duration::from_milliseconds(a.t_ - b.t_); -} - -wxString CDateTime::Format(wxString const& fmt, Zone z) const -{ - tm t = GetTm(z); - -#ifdef __WXMSW__ - int const count = 1000; - wxChar buf[count]; - -#ifdef __VISUALC__ - CrtAssertSuppressor suppressor; -#endif - wcsftime(buf, count - 1, fmt, &t); - buf[count - 1] = 0; - return buf; -#else - - auto fbuf = fmt.mb_str(); - if (!fbuf || !*fbuf) { - return wxString(); - } - - int const count = 1000; - char buf[count]; - strftime(buf, count -1, fbuf, &t); - buf[count - 1] = 0; - - return buf; -#endif -} - -time_t CDateTime::GetTimeT() const -{ - return t_ / 1000; -} - -tm CDateTime::GetTm(Zone z) const -{ - tm ret{}; - time_t t = GetTimeT(); -#ifdef __WXMSW__ - // gmtime_s/localtime_s don't work with negative times - if (t < 86400) { - FILETIME ft = GetFileTime(); - SYSTEMTIME st; - if (FileTimeToSystemTime(&ft, &st)) { - - if (a_ >= hours && z == local) { - SYSTEMTIME st2; - if (SystemTimeToTzSpecificLocalTime(0, &st, &st2)) { - st = st2; - } - } - - ret.tm_year = st.wYear - 1900; - ret.tm_mon = st.wMonth - 1; - ret.tm_mday = st.wDay; - ret.tm_wday = st.wDayOfWeek; - ret.tm_hour = st.wHour; - ret.tm_min = st.wMinute; - ret.tm_sec = st.wSecond; - ret.tm_yday = -1; - } - } - else { - // Special case: If having only days, don't perform conversion - if (z == utc || a_ == days) { - gmtime_s(&ret, &t); - } - else { - localtime_s(&ret, &t); - } - } -#else - if (z == utc || a_ == days) { - gmtime_r(&t, &ret); - } - else { - localtime_r(&t, &ret); - } -#endif - return ret; -} - -#ifdef __WXMSW__ - -CDateTime::CDateTime(FILETIME const& ft, Accuracy a) -{ - Set(ft, a); -} - -FILETIME CDateTime::GetFileTime() const -{ - FILETIME ret{}; - if (IsValid()) { - int64_t t = t_; - - t += EPOCH_OFFSET_IN_MSEC; - t *= 10000; - - ret.dwHighDateTime = t >> 32; - ret.dwLowDateTime = t & 0xffffffffll; - } - - return ret; -} - -#endif - -struct foo final -{ - foo() noexcept = default; - explicit foo(int, float) {} - foo(foo const&) noexcept = default; - foo(foo &&) noexcept = default; - - foo& operator=(foo const&) noexcept = default; - foo& operator=(foo &&) noexcept = default; -}; - -foo n() { - return foo(); -} - -void m() -{ - foo r, r2; - r = r2; - r = n(); -} diff -Nru filezilla-3.14.1/src/engine/tlssocket.cpp filezilla-3.15.0.2/src/engine/tlssocket.cpp --- filezilla-3.14.1/src/engine/tlssocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/tlssocket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -3,6 +3,8 @@ #include "tlssocket.h" #include "ControlSocket.h" +#include + #include #if FZ_USE_GNUTLS_SYSTEM_CIPHERS @@ -25,8 +27,8 @@ } #endif -CTlsSocket::CTlsSocket(CEventHandler* pEvtHandler, CSocket& socket, CControlSocket* pOwner) - : CEventHandler(pOwner->event_loop_) +CTlsSocket::CTlsSocket(event_handler* pEvtHandler, CSocket& socket, CControlSocket* pOwner) + : event_handler(pOwner->event_loop_) , CBackend(pEvtHandler) , m_pOwner(pOwner) , m_socket(socket) @@ -39,7 +41,7 @@ CTlsSocket::~CTlsSocket() { - RemoveHandler(); + remove_handler(); Uninit(); delete m_pSocketBackend; @@ -80,8 +82,30 @@ 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")); @@ -275,7 +299,7 @@ m_canReadFromSocket = false; if (error == EAGAIN) { if (m_canCheckCloseSocket && !m_pSocketBackend->IsWaiting(CRateLimiter::inbound)) { - SendEvent(m_pSocketBackend, SocketEventType::close, 0); + send_event(m_pSocketBackend, SocketEventType::close, 0); } } else { @@ -289,7 +313,7 @@ } if (m_canCheckCloseSocket) { - SendEvent(m_pSocketBackend, SocketEventType::close, 0); + send_event(m_pSocketBackend, SocketEventType::close, 0); } if (!read) { @@ -303,9 +327,9 @@ return read; } -void CTlsSocket::operator()(CEventBase const& ev) +void CTlsSocket::operator()(fz::event_base const& ev) { - Dispatch(ev, this, &CTlsSocket::OnSocketEvent); + fz::dispatch(ev, this, &CTlsSocket::OnSocketEvent); } void CTlsSocket::OnSocketEvent(CSocketEventSource*, SocketEventType t, int error) @@ -342,7 +366,7 @@ m_pOwner->LogMessage(MessageType::Debug_Info, _T("CTlsSocket::OnSocketEvent(): close event received")); //Uninit(); - m_pEvtHandler->SendEvent(this, SocketEventType::close, 0); + m_pEvtHandler->send_event(this, SocketEventType::close, 0); } break; default: @@ -458,11 +482,11 @@ hostname = m_socket.GetPeerHost(); } - if( !hostname.empty() && !IsIpAddress(hostname) ) { + if (!hostname.empty() && fz::get_address_type(hostname.ToStdWstring()) == fz::address_type::unknown) { const wxWX2MBbuf utf8 = hostname.mb_str(wxConvUTF8); - if( utf8 ) { + if (utf8) { int res = gnutls_server_name_set( m_session, GNUTLS_NAME_DNS, utf8, strlen(utf8) ); - if( res ) { + if (res) { LogError(res, _T("gnutls_server_name_set"), MessageType::Debug_Warning ); } } @@ -504,7 +528,7 @@ if (m_shutdown_requested) { int error = Shutdown(); if (!error || error != EAGAIN) { - m_pEvtHandler->SendEvent(this, SocketEventType::close, 0); + m_pEvtHandler->send_event(this, SocketEventType::close, 0); } } @@ -646,12 +670,12 @@ return; if (m_canTriggerRead) { - m_pEvtHandler->SendEvent(this, SocketEventType::read, 0); + m_pEvtHandler->send_event(this, SocketEventType::read, 0); m_canTriggerRead = false; } if (m_canTriggerWrite) { - m_pEvtHandler->SendEvent(this, SocketEventType::write, 0); + m_pEvtHandler->send_event(this, SocketEventType::write, 0); m_canTriggerWrite = false; } } @@ -723,7 +747,7 @@ Uninit(); if (send_close) { - m_pEvtHandler->SendEvent(this, SocketEventType::close, m_socket_error); + m_pEvtHandler->send_event(this, SocketEventType::close, m_socket_error); } } @@ -795,7 +819,7 @@ if (!res) { m_tlsState = TlsState::closed; - m_pEvtHandler->SendEvent(this, SocketEventType::close, 0); + m_pEvtHandler->send_event(this, SocketEventType::close, 0); return; } @@ -819,7 +843,7 @@ CheckResumeFailedReadWrite(); if (m_tlsState == TlsState::conn) { - m_pEvtHandler->SendEvent(this, SocketEventType::connection, 0); + m_pEvtHandler->send_event(this, SocketEventType::connection, 0); } TriggerEvents(); @@ -859,8 +883,8 @@ return false; } - CDateTime expirationTime(gnutls_x509_crt_get_expiration_time(cert), CDateTime::seconds); - CDateTime activationTime(gnutls_x509_crt_get_activation_time(cert), CDateTime::seconds); + 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]; @@ -1001,7 +1025,7 @@ return ret; } -bool CTlsSocket::CertificateIsBlacklisted(std::vector const& certificates) +bool CTlsSocket::CertificateIsBlacklisted(std::vector const&) { return false; } @@ -1158,7 +1182,7 @@ return FZ_REPLY_WOULDBLOCK; } -void CTlsSocket::OnRateAvailable(enum CRateLimiter::rate_direction) +void CTlsSocket::OnRateAvailable(CRateLimiter::rate_direction) { } diff -Nru filezilla-3.14.1/src/engine/tlssocket.h filezilla-3.15.0.2/src/engine/tlssocket.h --- filezilla-3.14.1/src/engine/tlssocket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/tlssocket.h 2016-02-05 08:54:46.000000000 +0000 @@ -6,7 +6,7 @@ #include "socket.h" class CControlSocket; -class CTlsSocket final : protected CEventHandler, public CBackend +class CTlsSocket final : protected fz::event_handler, public CBackend { public: enum class TlsState @@ -19,7 +19,7 @@ closed }; - CTlsSocket(CEventHandler* pEvtHandler, CSocket& pSocket, CControlSocket* pOwner); + CTlsSocket(fz::event_handler* pEvtHandler, CSocket& pSocket, CControlSocket* pOwner); virtual ~CTlsSocket(); bool Init(); @@ -47,13 +47,14 @@ static wxString ListTlsCiphers(wxString 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); - virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction); + virtual void OnRateAvailable(CRateLimiter::rate_direction direction); int ContinueHandshake(); void ContinueShutdown(); @@ -85,7 +86,7 @@ void TriggerEvents(); - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); void OnRead(); diff -Nru filezilla-3.14.1/src/engine/transfersocket.cpp filezilla-3.15.0.2/src/engine/transfersocket.cpp --- filezilla-3.14.1/src/engine/transfersocket.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/transfersocket.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -9,8 +9,10 @@ #include "proxy.h" #include "servercapabilities.h" +#include + CTransferSocket::CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode) -: CEventHandler(controlSocket.event_loop_) +: fz::event_handler(controlSocket.event_loop_) , engine_(engine) , controlSocket_(controlSocket) , m_transferMode(transferMode) @@ -19,7 +21,7 @@ CTransferSocket::~CTransferSocket() { - RemoveHandler(); + remove_handler(); if (m_transferEndReason == TransferEndReason::none) m_transferEndReason = TransferEndReason::successful; ResetSocket(); @@ -310,7 +312,7 @@ FinalizeWrite(); } else { - SendEvent(m_pBackend, SocketEventType::read, 0); + send_event(m_pBackend, SocketEventType::read, 0); } } else if (m_transferMode == TransferMode::resumetest) { @@ -411,7 +413,7 @@ } } else if (written > 0) { - SendEvent(m_pBackend, SocketEventType::write, 0); + send_event(m_pBackend, SocketEventType::write, 0); } } @@ -573,7 +575,7 @@ ResetSocket(); - engine_.SendEvent(engineTransferEnd); + engine_.send_event(engineTransferEnd); } CSocket* CTransferSocket::CreateSocketServer(int port) @@ -617,7 +619,7 @@ low = high; if (start < low || start > high) { - start = GetRandomNumber(low, high); + start = fz::random_number(low, high); wxASSERT(start >= low && start <= high); } @@ -703,6 +705,8 @@ void CTransferSocket::FinalizeWrite() { bool res = ioThread_->Finalize(BUFFERSIZE - m_transferBufferLen); + m_transferBufferLen = BUFFERSIZE; + if (m_transferEndReason != TransferEndReason::none) return; @@ -793,9 +797,9 @@ pSocket->SetBufferSizes(size_read, size_write); } -void CTransferSocket::operator()(CEventBase const& ev) +void CTransferSocket::operator()(fz::event_base const& ev) { - Dispatch(ev, this, + fz::dispatch(ev, this, &CTransferSocket::OnSocketEvent, &CTransferSocket::OnIOThreadEvent); } diff -Nru filezilla-3.14.1/src/engine/transfersocket.h filezilla-3.15.0.2/src/engine/transfersocket.h --- filezilla-3.14.1/src/engine/transfersocket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/engine/transfersocket.h 2016-02-10 19:27:09.000000000 +0000 @@ -19,7 +19,7 @@ class CIOThread; class CTlsSocket; -class CTransferSocket final : public CEventHandler +class CTransferSocket final : public fz::event_handler { public: CTransferSocket(CFileZillaEnginePrivate & engine, CFtpControlSocket & controlSocket, TransferMode transferMode); @@ -63,7 +63,7 @@ void SetSocketBufferSizes(CSocket* pSocket); - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnIOThreadEvent(); CSocket *m_pSocket{}; diff -Nru filezilla-3.14.1/src/FileZilla.sln filezilla-3.15.0.2/src/FileZilla.sln --- filezilla-3.14.1/src/FileZilla.sln 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/FileZilla.sln 2016-02-05 08:54:46.000000000 +0000 @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcxproj", "{AAD2642D-D07A-4415-BB32-D678D89D546F}" EndProject @@ -15,6 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A46BE87D-2CB7-428D-887D-32D3F628206D}" EndProject Global + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 diff -Nru filezilla-3.14.1/src/fzshellext/fzshellext.rc filezilla-3.15.0.2/src/fzshellext/fzshellext.rc --- filezilla-3.14.1/src/fzshellext/fzshellext.rc 2015-03-02 11:49:39.000000000 +0000 +++ filezilla-3.15.0.2/src/fzshellext/fzshellext.rc 2016-02-05 08:54:46.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-2015" + VALUE "LegalCopyright", "Copyright (C) 2006-2016" VALUE "OriginalFilename", "fzshellext.dll" VALUE "ProductName", " fzshellext Dynamic Link Library" VALUE "ProductVersion", "3, 10, 2, 0" diff -Nru filezilla-3.14.1/src/fzshellext/version.rc.in filezilla-3.15.0.2/src/fzshellext/version.rc.in --- filezilla-3.14.1/src/fzshellext/version.rc.in 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/src/fzshellext/version.rc.in 2016-02-05 08:54:46.000000000 +0000 @@ -17,7 +17,7 @@ BEGIN VALUE "FileDescription", "fzshellext Dynamic Link Library" VALUE "InternalName", "fzshellext" - VALUE "LegalCopyright", "Copyright (C) 2006-2015" + VALUE "LegalCopyright", "Copyright (C) 2006-2016" VALUE "OriginalFilename", "fzshellext.dll" VALUE "ProductName", " fzshellext Dynamic Link Library" VALUE "Comments", "Version @PACKAGE_VERSION@" diff -Nru filezilla-3.14.1/src/include/apply.h filezilla-3.15.0.2/src/include/apply.h --- filezilla-3.14.1/src/include/apply.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/apply.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#ifndef FILEZILLA_APPLY_HEADER -#define FILEZILLA_APPLY_HEADER - -#include -#include - -// apply takes a function and a tuple as argument -// and calls the function with the tuple's elements as argument - -// An integer sequence... -template -struct int_seq {}; - -// ... and the machinery to construct it -template -struct int_seq_gen : int_seq_gen {}; - -template -struct int_seq_gen<0, Seq...> -{ - typedef int_seq type; -}; - -// Apply tuple to ordinary functor -template -auto apply_(F&& f, T&& t, int_seq const&) -> decltype(std::forward(f)(std::get(std::forward(t))...)) -{ - return std::forward(f)(std::get(std::forward(t))...); -} - -template::type>::value>::type> -auto apply(F && f, T&& args) -> decltype(apply_(std::forward(f), std::forward(args), Seq())) -{ - return apply_(std::forward(f), std::forward(args), Seq()); -} - -// Apply tuple to pointer to member function -template -auto apply_(Obj&& obj, F&& f, T&& t, int_seq const&) -> decltype((std::forward(obj)->*std::forward(f))(std::get(std::forward(t))...)) -{ - return (std::forward(obj)->*std::forward(f))(std::get(std::forward(t))...); -} - -template::type>::value>::type> -auto apply(Obj&& obj, F && f, T&& args) -> decltype(apply_(std::forward(obj), std::forward(f), std::forward(args), Seq())) -{ - return apply_(std::forward(obj), std::forward(f), std::forward(args), Seq()); -} - -#endif diff -Nru filezilla-3.14.1/src/include/directorylisting.h filezilla-3.15.0.2/src/include/directorylisting.h --- filezilla-3.14.1/src/include/directorylisting.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/directorylisting.h 2016-02-05 08:54:46.000000000 +0000 @@ -2,17 +2,17 @@ #define __DIRECTORYLISTING_H__ #include "optional.h" -#include "timeex.h" +#include #include class CDirentry { public: - fzstring name; + std::wstring name; int64_t size; - CRefcountObject permissions; - CRefcountObject ownerGroup; + CRefcountObject permissions; + CRefcountObject ownerGroup; enum _flags { @@ -39,22 +39,22 @@ inline bool has_date() const { - return time.IsValid();; + return time.empty();; } inline bool has_time() const { - return time.IsValid() && time.GetAccuracy() >= CDateTime::hours; + return time.empty() && time.get_accuracy() >= fz::datetime::hours; } inline bool has_seconds() const { - return time.IsValid() && time.GetAccuracy() >= CDateTime::seconds; + return time.empty() && time.get_accuracy() >= fz::datetime::seconds; } - CSparseOptional target; // Set to linktarget it link is true + CSparseOptional target; // Set to linktarget it link is true - CDateTime time; + fz::datetime time; wxString dump() const; bool operator==(const CDirentry &op) const; @@ -89,7 +89,7 @@ void ClearFindMap(); CServerPath path; - CMonotonicClock m_firstListTime; + fz::monotonic_clock m_firstListTime; enum { @@ -130,14 +130,14 @@ bool RemoveEntry(unsigned int index); - void GetFilenames(std::vector &names) const; + void GetFilenames(std::vector &names) const; protected: CRefcountObject_Uninitialized > > m_entries; - mutable CRefcountObject_Uninitialized > m_searchmap_case; - mutable CRefcountObject_Uninitialized > m_searchmap_nocase; + mutable CRefcountObject_Uninitialized > m_searchmap_case; + mutable CRefcountObject_Uninitialized > m_searchmap_nocase; unsigned int m_entryCount{}; }; diff -Nru filezilla-3.14.1/src/include/engine_context.h filezilla-3.15.0.2/src/include/engine_context.h --- filezilla-3.14.1/src/include/engine_context.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/engine_context.h 2016-02-05 08:54:46.000000000 +0000 @@ -4,11 +4,14 @@ #include class CDirectoryCache; -class CEventLoop; class COptionsBase; class CPathCache; class CRateLimiter; +namespace fz { +class event_loop; +} + // There can be multiple engines, but there can be at most one context class CFileZillaEngineContext final { @@ -17,7 +20,7 @@ ~CFileZillaEngineContext(); COptionsBase& GetOptions(); - CEventLoop& GetEventLoop(); + fz::event_loop& GetEventLoop(); CRateLimiter& GetRateLimiter(); CDirectoryCache& GetDirectoryCache(); CPathCache& GetPathCache(); diff -Nru filezilla-3.14.1/src/include/event.h filezilla-3.15.0.2/src/include/event.h --- filezilla-3.14.1/src/include/event.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/event.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -#ifndef FILEZILLA_ENGINE_EVENT_HEADER -#define FILEZILLA_ENGINE_EVENT_HEADER - -/* -Common base class for all events. - -If possible, use CEvent<> below instead of deriving from CEventBase directly. - -Keep events as simple as possible. Avoid mutexes in your events. -*/ -class CEventBase -{ -public: - CEventBase() = default; - virtual ~CEventBase() {} - - CEventBase(CEventBase const&) = delete; - CEventBase& operator=(CEventBase const&) = delete; - - /* - The returned pointer must be unique for the derived type such that: - CEventBase& a = ... - CEventBase& b = ... - assert((a.derived_type() == b.derived_type()) == (typeid(a) == typeid(b))); - - Beware: Using &typeid is tempting, but unspecifined (sic) - - Best solution is to have your derived type return the address of a static data member of it - */ - virtual void const* derived_type() const = 0; -}; - -/* -This is the recommended event class. - -Instanciate the template with a unique type to identify the type of the event and a number of types for the values. - -Keep the values simple, in particular avoid mutexes in your values. - -See event_handler.h for usage example. -*/ -template -class CEvent final : public CEventBase -{ -public: - typedef UniqueType unique_type; - typedef std::tuple tuple_type; - - CEvent() = default; - - template - explicit CEvent(First_Value&& value, Remaining_Values&& ...values) - : v_(std::forward(value), std::forward(values)...) - { - } - - CEvent(CEvent const& op) = default; - CEvent& operator=(CEvent const& op) = default; - - // Returns a unique pointer for the type such that can be used directly in derived_type. - static void const* type() { - static const char* f = 0; - return &f; - } - - virtual void const* derived_type() const { - return type(); - } - - tuple_type v_; -}; - -// Returns true iff T& t = ...; t.derived_type() == ev.derived_type() -template -bool same_type(CEventBase const& ev) -{ - return ev.derived_type() == T::type(); -} - -typedef unsigned long long timer_id; -struct timer_event_type{}; -typedef CEvent CTimerEvent; - -#endif diff -Nru filezilla-3.14.1/src/include/event_handler.h filezilla-3.15.0.2/src/include/event_handler.h --- filezilla-3.14.1/src/include/event_handler.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/event_handler.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -#ifndef FILEZILLA_ENGINE_EVENT_HANDLER -#define FILEZILLA_ENGINE_EVENT_HANDLER - -class CEventBase; -class CEventLoop; - -#include "event_loop.h" - -/* -Simple handler for asynchronous event processing. - -Usage example: - struct foo_event_type{}; // Any uniquely named type that's not implicitly convertible - typedef CEvent CFooEvent; - - struct bar_event_type{}; - typedef CEvent CBarEvent; - - class MyHandler final : public CEventHandler - { - public: - MyHandler(CEventLoop& loop) - : CEventHandler(loop) - {} - - virtual ~MyHandler() - { - RemoveHandler(); - } - - void foo(int v, std::string const& s) { - std::cout << "foo called with:" << s << v; - } - - void bar() { - std::cout << "bar called"; - } - - virtual void operator()(CEventBase const& ev) { - // Tip: Put in order of decreasing frequency - Dispatch(ev, this, &MyHandler::foo, &MyHandler::bar); - } - }; - - CEventLoop loop; - MyHandler h(loop); - h.SendEvent(42, "Don't Panic"); -*/ - -class CEventHandler -{ -public: - CEventHandler() = delete; - - explicit CEventHandler(CEventLoop& loop); - virtual ~CEventHandler(); - - CEventHandler(CEventHandler const&) = delete; - CEventHandler& operator=(CEventHandler const&) = delete; - - // Deactivates handler, removes all pending events and stops all timers for this handler. - // When function returns, handler is not in its callback anymore. - // - // You _MUST_ call RemoveHandler no later than inside the destructor of the most derived class. - // - // This may deadlock if a handler removes itself inside its own callback - void RemoveHandler(); - - // Called by the event loop in the worker thread with the event to process - // - // Override in your derived class. - // Consider using the Dispatch function inside. - virtual void operator()(CEventBase const&) = 0; - - // Sends the passed event asynchronously to the handler. - // Can be called from any thread. - // All events are processed in-order. - // - // See also operator()(CEventBase const&) - template - void SendEvent(Args&&... args) { - event_loop_.SendEvent(this, new T(std::forward(args)...)); - }; - - // Adds a timer, returns the timer id. - // One-shot timers are deleted automatically - // - // Once the interval expires, you get a timer event from the event loop. - // If multiple intervals expire before the timer fires, e.g. under heavy load, - // only one event is sent. - // The next timer event is scheduled ms_intervals into the future at the time right before - // the callback is called. - // - // If multiple timers have expired, the order in which the callback is executed is unspecified, - // there is no fairness guarantee. - // Timers take precedence over queued events. - // High-frequency timers doing heavy processing can starve other timers and queued events. - timer_id AddTimer(duration const& interval, bool one_shot); - - // Stops the given timer. - // One-shot timers that have fired do not need to be stopped. - void StopTimer(timer_id id); - - CEventLoop & event_loop_; -private: - friend class CEventLoop; - bool removing_{}; -}; - -#endif \ No newline at end of file diff -Nru filezilla-3.14.1/src/include/event_loop.h filezilla-3.15.0.2/src/include/event_loop.h --- filezilla-3.14.1/src/include/event_loop.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/event_loop.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -#ifndef FILEZILLA_ENGINE_EVENT_LOOP_HEADER -#define FILEZILLA_ENGINE_EVENT_LOOP_HEADER - -#include "apply.h" -#include "event.h" -#include "mutex.h" -#include "timeex.h" - -#include -#include -#include - -class CEventHandler; -struct timer_data final -{ - CEventHandler* handler_{}; - timer_id id_{}; - CMonotonicClock deadline_; - duration interval_{}; -}; - -// Timers have precedence over queued events. Too many or too frequent timers can starve processing queued events. -// If the deadline of multiple timers have expired, they get processed in an unspecified order -class CEventLoop final : private wxThread -{ -public: - typedef std::deque> Events; - - // Spawns a thread - CEventLoop(); - virtual ~CEventLoop(); - - CEventLoop(CEventLoop const&) = delete; - CEventLoop& operator=(CEventLoop const&) = delete; - - // Puts all queued events through the filter function. - // The filter function can freely change the passed events. - // If the filter function returns true, the corresponding event - // gets removed. - void FilterEvents(std::function const& filter); - -protected: - friend class CEventHandler; - - void RemoveHandler(CEventHandler* handler); - - timer_id AddTimer(CEventHandler* handler, duration const& interval, bool one_shot); - void StopTimer(timer_id id); - - void SendEvent(CEventHandler* handler, CEventBase* evt); - - // Process timers. Returns true if a timer has been triggered - bool ProcessTimers(scoped_lock & l, CMonotonicClock const& now); - - virtual wxThread::ExitCode Entry(); - - typedef std::vector Timers; - - Events pending_events_; - Timers timers_; - - mutex sync_; - condition cond_; - - bool quit_{}; - - CEventHandler * active_handler_{}; - - // Process the next (if any) event. Returns true if an event has been processed - bool ProcessEvent(scoped_lock & l); - - CMonotonicClock deadline_; - - timer_id next_timer_id_{}; -}; - - -// Dispatch for CEvent<> based events. See event_handler.h for usage example -template -bool Dispatch(CEventBase const& ev, F&& f) -{ - bool const same = same_type(ev); - if (same) { - T const* e = static_cast(&ev); - apply(std::forward(f), e->v_); - } - return same; -} - - -template -bool Dispatch(CEventBase const& ev, H* h, F&& f) -{ - bool const same = same_type(ev); - if (same) { - T const* e = static_cast(&ev); - apply(h, std::forward(f), e->v_); - } - return same; -} - -template -bool Dispatch(CEventBase const& ev, H* h, F&& f, Fs&& ... fs) -{ - if (Dispatch(ev, h, std::forward(f))) { - return true; - } - - return Dispatch(ev, h, std::forward(fs)...); -} - -#endif diff -Nru filezilla-3.14.1/src/include/externalipresolver.h filezilla-3.15.0.2/src/include/externalipresolver.h --- filezilla-3.14.1/src/include/externalipresolver.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/externalipresolver.h 2016-02-05 08:54:46.000000000 +0000 @@ -4,12 +4,12 @@ #include "socket.h" struct external_ip_resolve_event_type; -typedef CEvent CExternalIPResolveEvent; +typedef fz::simple_event CExternalIPResolveEvent; -class CExternalIPResolver final : public CEventHandler +class CExternalIPResolver final : public fz::event_handler { public: - CExternalIPResolver(CEventHandler & handler); + CExternalIPResolver(fz::event_handler & handler); virtual ~CExternalIPResolver(); CExternalIPResolver(CExternalIPResolver const&) = delete; @@ -28,7 +28,7 @@ wxString m_address; CSocket::address_family m_protocol{}; unsigned long m_port{80}; - CEventHandler * m_handler{}; + fz::event_handler * m_handler{}; bool m_done{}; @@ -36,7 +36,7 @@ CSocket *m_pSocket{}; - virtual void operator()(CEventBase const& ev); + virtual void operator()(fz::event_base const& ev); void OnSocketEvent(CSocketEventSource* source, SocketEventType t, int error); void OnConnect(int error); diff -Nru filezilla-3.14.1/src/include/file.h filezilla-3.15.0.2/src/include/file.h --- filezilla-3.14.1/src/include/file.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/file.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -#ifndef FILEZILLA_FILE_HEADER -#define FILEZILLA_FILE_HEADER - -// Lean replacement of wxFile that is implemented in terms of CreateFile instead of _open on Windows. -class CFile final -{ -public: - enum mode { - read, - write - }; - - // Only evaluated when opening existing files for writing - // Non-existing files will always be created when writing. - // Opening for reading never creates files - enum disposition - { - existing, // Keep existing data - truncate // Truncate file - }; - - CFile(); - CFile(wxString const& f, mode m, disposition d = existing); - - ~CFile(); - - CFile(CFile const&) = delete; - CFile& operator=(CFile const&) = delete; - - bool Opened() const; - - bool Open(wxString const& f, mode m, disposition d = existing); - void Close(); - - enum seekMode - { - begin, - current, - end - }; - - // Gets size of file - // Returns -1 on error - wxFileOffset Length() const; - - // Relative seek based on seek mode - // Returns -1 on error, otherwise new absolute offset in file - // On failure, the new position in the file is undefined. - wxFileOffset Seek(wxFileOffset offset, seekMode m); - - // Truncate the file to the current position of the file pointer. - bool Truncate(); - - // Returns number of bytes read or -1 on error - ssize_t Read(void *buf, size_t count); - - // Returns number of bytes written or -1 on error - ssize_t Write(void const* buf, size_t count); - -protected: -#ifdef __WXMSW__ - HANDLE hFile_{INVALID_HANDLE_VALUE}; -#else - int fd_{-1}; -#endif -}; - -#endif diff -Nru filezilla-3.14.1/src/include/fzstring.h filezilla-3.15.0.2/src/include/fzstring.h --- filezilla-3.14.1/src/include/fzstring.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/fzstring.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#ifndef FILEZILLA_ENGINE_FZSTRING_HEADER -#define FILEZILLA_ENGINE_FZSTRING_HEADER - -#include "libfilezilla.h" - -#include - -typedef std::wstring fzstring; - -inline fzstring to_fzstring(wxString const& s) { return s.ToStdWstring(); } -#ifdef __WXMSW__ -inline int collate_fzstring(fzstring const& a, fzstring const& b) { return _wcsicmp(a.c_str(), b.c_str()); } // note: does not handle embedded null -#else -inline int collate_fzstring(fzstring const& a, fzstring const& b) { return wcscasecmp(a.c_str(), b.c_str()); } // note: does not handle embedded null -#endif - -#endif diff -Nru filezilla-3.14.1/src/include/libfilezilla_engine.h filezilla-3.15.0.2/src/include/libfilezilla_engine.h --- filezilla-3.14.1/src/include/libfilezilla_engine.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.15.0.2/src/include/libfilezilla_engine.h 2016-02-05 08:54:46.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef LIBFILEZILLA_ENGINE_HEADER +#define LIBFILEZILLA_ENGINE_HEADER + +#ifdef HAVE_CONFIG_H + #include +#endif + +#ifndef PACKAGE_STRING +#define PACKAGE_STRING "FileZilla 3" +#endif + +#include + +// Include after defs.h so that __WXFOO__ is properly defined +#include "setup.h" + +#ifdef __WXMSW__ +#ifndef NOMINMAX +#define NOMINMAX +#endif +#ifndef STRICT +#define STRICT 1 +#endif +#include +#endif + +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +#include "optionsbase.h" +#include "logging.h" +#include "server.h" +#include "serverpath.h" +#include "commands.h" +#include "notification.h" +#include "FileZillaEngine.h" +#include "directorylisting.h" + +#include "misc.h" + +#define TRANSLATE_T(str) _T(str) + +#endif diff -Nru filezilla-3.14.1/src/include/libfilezilla.h filezilla-3.15.0.2/src/include/libfilezilla.h --- filezilla-3.14.1/src/include/libfilezilla.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/libfilezilla.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#ifndef __LIBFILEZILLA_H__ -#define __LIBFILEZILLA_H__ - -#ifdef HAVE_CONFIG_H - #include -#endif - -#ifndef PACKAGE_STRING -#define PACKAGE_STRING "FileZilla 3" -#endif - -#include - -// Include after defs.h so that __WXFOO__ is properly defined -#include "setup.h" - -#ifdef __WXMSW__ -#ifndef NOMINMAX -#define NOMINMAX -#endif -#ifndef STRICT -#define STRICT 1 -#endif -#include -#endif - -#include -#include -#include -#include - -#include -#include -#include - -#include "fzstring.h" -#include "optionsbase.h" -#include "logging.h" -#include "server.h" -#include "serverpath.h" -#include "commands.h" -#include "notification.h" -#include "FileZillaEngine.h" -#include "directorylisting.h" - -#include "misc.h" - -#define TRANSLATE_T(str) _T(str) - -#endif //__LIBFILEZILLA_H__ diff -Nru filezilla-3.14.1/src/include/local_filesys.h filezilla-3.15.0.2/src/include/local_filesys.h --- filezilla-3.14.1/src/include/local_filesys.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/local_filesys.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -#ifndef __LOCAL_FILESYS_H__ -#define __LOCAL_FILESYS_H__ - -// This class adds an abstraction layer for the local filesystem. -// Although wxWidgets provides functions for this, they are in -// general too slow. -// This class offers exactly what's needed by FileZilla and -// exploits some platform-specific features. -class CLocalFileSystem final -{ -public: - CLocalFileSystem() = default; - ~CLocalFileSystem(); - - CLocalFileSystem(CLocalFileSystem const&) = delete; - CLocalFileSystem& operator=(CLocalFileSystem const&) = delete; - - enum local_fileType - { - unknown = -1, - file, - dir, - link, - link_file = link, - link_dir - }; - - static const wxChar path_separator; - - // If called with a symlink, GetFileType stats the link, not - // the target. - static local_fileType GetFileType(wxString const& path); - - // Follows symlinks and stats the target, sets isLink to true if path was - // a link. - static local_fileType GetFileInfo(wxString const& path, bool &isLink, int64_t* size, CDateTime* modificationTime, int* mode); - - // Shortcut, returns -1 on error. - static int64_t GetSize(wxString const& path, bool *isLink = 0); - - // If parent window is given, display confirmation dialog - // Returns false iff there's an encoding error, e.g. program - // started without UTF-8 locale. - static bool RecursiveDelete(wxString const& path, wxWindow* parent); - static bool RecursiveDelete(std::list dirsToVisit, wxWindow* parent); - - bool BeginFindFiles(wxString path, bool dirs_only); - bool GetNextFile(wxString& name); - bool GetNextFile(wxString& name, bool &isLink, bool &is_dir, int64_t* size, CDateTime* modificationTime, int* mode); - void EndFindFiles(); - - static CDateTime GetModificationTime(wxString const& path); - static bool SetModificationTime(wxString const& path, const CDateTime& t); - - static wxString GetSymbolicLinkTarget(wxString const& path); - -protected: -#ifndef __WXMSW__ - static local_fileType GetFileInfo(const char* path, bool &isLink, int64_t* size, CDateTime* modificationTime, int* mode); - void AllocPathBuffer(const char* file); // Ensures m_raw_path is large enough to hold path and filename -#endif - - // State for directory enumeration - bool m_dirs_only{}; -#ifdef __WXMSW__ - WIN32_FIND_DATA m_find_data; - HANDLE m_hFind{INVALID_HANDLE_VALUE}; - bool m_found{}; - wxString m_find_path; -#else - char* m_raw_path{}; - char* m_file_part{}; // Points into m_raw_path past the trailing slash of the path part - int m_buffer_length{}; - DIR* m_dir{}; -#endif -}; - -#endif //__LOCAL_FILESYS_H__ diff -Nru filezilla-3.14.1/src/include/Makefile.am filezilla-3.15.0.2/src/include/Makefile.am --- filezilla-3.14.1/src/include/Makefile.am 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/Makefile.am 2016-02-05 08:54:46.000000000 +0000 @@ -1,24 +1,16 @@ # these are the headers for your project noinst_HEADERS = \ - apply.h \ commands.h \ directorylisting.h \ engine_context.h \ - event.h \ - event_handler.h \ - event_loop.h \ externalipresolver.h \ FileZillaEngine.h \ - file.h \ - fzstring.h \ - libfilezilla.h \ - local_filesys.h \ + libfilezilla_engine.h \ local_path.h \ logging.h \ misc.h \ msgbox.h \ - mutex.h \ notification.h \ optional.h \ optionsbase.h \ @@ -28,6 +20,5 @@ serverpath.h \ setup.h \ sizeformatting_base.h \ - socket.h \ - timeex.h + socket.h diff -Nru filezilla-3.14.1/src/include/Makefile.in filezilla-3.15.0.2/src/include/Makefile.in --- filezilla-3.14.1/src/include/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/src/include/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -195,6 +195,8 @@ 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@ @@ -315,24 +317,16 @@ xdgopen = @xdgopen@ xgettext = @xgettext@ noinst_HEADERS = \ - apply.h \ commands.h \ directorylisting.h \ engine_context.h \ - event.h \ - event_handler.h \ - event_loop.h \ externalipresolver.h \ FileZillaEngine.h \ - file.h \ - fzstring.h \ - libfilezilla.h \ - local_filesys.h \ + libfilezilla_engine.h \ local_path.h \ logging.h \ misc.h \ msgbox.h \ - mutex.h \ notification.h \ optional.h \ optionsbase.h \ @@ -342,8 +336,7 @@ serverpath.h \ setup.h \ sizeformatting_base.h \ - socket.h \ - timeex.h + socket.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -Nru filezilla-3.14.1/src/include/misc.h filezilla-3.15.0.2/src/include/misc.h --- filezilla-3.14.1/src/include/misc.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/misc.h 2016-02-05 08:54:46.000000000 +0000 @@ -3,30 +3,6 @@ #include "socket.h" -// Also verifies that it is a correct IPv6 address -wxString GetIPV6LongForm(wxString short_address); - -int DigitHexToDecNum(wxChar c); - -bool IsRoutableAddress(const wxString& address, CSocket::address_family family); - -bool IsIpAddress(const wxString& address); - -// Get a random number uniformly distributed in the closed interval [min, max] -int GetRandomNumber(int low, int high); - -// Under some locales (e.g. Turkish), there is a different -// relationship between the letters a-z and A-Z. -// In Turkish for example there are different types of i -// (dotted and dotless), with i lowercase dotted and I -// uppercase dotless. -// If needed, use this function to transform the case manually -// and locale-independently -// In addition to the usual A-Z to a-z, the other two i's are -// transformed to lowercase dotted i as well. -void MakeLowerAscii(wxString& str); -void MakeLowerAscii(fzstring& str); - // Strongly typed enum would be nice, but we need to support older compilers still. namespace dependency { enum type { diff -Nru filezilla-3.14.1/src/include/mutex.h filezilla-3.15.0.2/src/include/mutex.h --- filezilla-3.14.1/src/include/mutex.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/mutex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -#ifndef FILEZILLA_MUTEX_HEADER -#define FILEZILLA_MUTEX_HEADER - -/* A mutex, or critical section, should be as lightweight as possible. - * Unfortunately, wxWidgets' mutex isn't lightweight at all. - * Testing has shown that locking or unlocking a wxMutex consists of - * 60% useless cruft, e.g. deadlock detection (Why try to detect deadlocks? - * Deadlocks detect itself!) - * - * Likewise, wxCondition carries a heavy overhead as well. In particular, under MSW - * it doesn't and can't (due to XP compatibility) use Vista+'s CONDITION_VARIABLE. - * - * Unfortunately we can't use std::mutex for the rescue as MinGW doesn't implement - * C++11 threading yet in common configurations. - */ - -#ifndef __WXMSW__ -#include -#endif - -class mutex final -{ -public: - explicit mutex(bool recursive = true); - ~mutex(); - - mutex( mutex const& ) = delete; - mutex& operator=( mutex const& ) = delete; - - // Beware, manual locking isn't exception safe - void lock(); - void unlock(); - -private: - friend class condition; - friend class scoped_lock; - -#ifdef __WXMSW__ - CRITICAL_SECTION m_; -#else - pthread_mutex_t m_; -#endif -}; - -class scoped_lock final -{ -public: - explicit scoped_lock(mutex& m) - : m_(&m.m_) - { -#ifdef __WXMSW__ - EnterCriticalSection(m_); -#else - pthread_mutex_lock(m_); -#endif - } - - ~scoped_lock() - { - if (locked_) { - #ifdef __WXMSW__ - LeaveCriticalSection(m_); - #else - pthread_mutex_unlock(m_); - #endif - } - - } - - scoped_lock( scoped_lock const& ) = delete; - scoped_lock& operator=( scoped_lock const& ) = delete; - - void lock() - { - locked_ = true; -#ifdef __WXMSW__ - EnterCriticalSection(m_); -#else - pthread_mutex_lock(m_); -#endif - } - - void unlock() - { - locked_ = false; -#ifdef __WXMSW__ - LeaveCriticalSection(m_); -#else - pthread_mutex_unlock(m_); -#endif - } - -private: - friend class condition; - -#ifdef __WXMSW__ - CRITICAL_SECTION * const m_; -#else - pthread_mutex_t * const m_; -#endif - bool locked_{true}; -}; - -class condition final -{ -public: - condition(); - ~condition(); - - condition(condition const&) = delete; - condition& operator=(condition const&) = delete; - - void wait(scoped_lock& l); - - // Milliseconds - // Returns false on timeout - bool wait(scoped_lock& l, int timeout_ms); - - void signal(scoped_lock& l); - - bool signalled(scoped_lock const&) const { return signalled_; } -private: -#ifdef __WXMSW__ - CONDITION_VARIABLE cond_; -#else - pthread_cond_t cond_; -#endif - bool signalled_; -}; - -#endif diff -Nru filezilla-3.14.1/src/include/notification.h filezilla-3.15.0.2/src/include/notification.h --- filezilla-3.14.1/src/include/notification.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/notification.h 2016-02-05 08:54:46.000000000 +0000 @@ -22,7 +22,7 @@ // CFileZillaEngine::SetAsyncRequestReply to continue the current operation. #include "local_path.h" -#include "timeex.h" +#include class CFileZillaEngine; class wxFzEvent final : public wxEvent @@ -158,12 +158,12 @@ wxString localFile; int64_t localSize{-1}; - CDateTime localTime; + fz::datetime localTime; wxString remoteFile; CServerPath remotePath; int64_t remoteSize{-1}; - CDateTime remoteTime; + fz::datetime remoteTime; bool ascii{}; @@ -247,7 +247,7 @@ , list(l) {} - CDateTime started; + fz::datetime started; wxFileOffset totalSize{-1}; // Total size of the file to transfer, -1 if unknown wxFileOffset startOffset{-1}; wxFileOffset currentOffset{-1}; @@ -324,7 +324,7 @@ CCertificate() = default; CCertificate( unsigned char const* rawData, unsigned int len, - CDateTime const& activationTime, CDateTime const& expirationTime, + fz::datetime const& activationTime, fz::datetime const& expirationTime, wxString const& serial, wxString const& pkalgoname, unsigned int bits, wxString const& signalgoname, @@ -338,8 +338,8 @@ ~CCertificate(); const unsigned char* GetRawData(unsigned int& len) const { len = m_len; return m_rawData; } - CDateTime GetActivationTime() const { return m_activationTime; } - CDateTime GetExpirationTime() const { return m_expirationTime; } + 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; } @@ -358,8 +358,8 @@ std::vector const& GetAltSubjectNames() const { return m_altSubjectNames; } private: - CDateTime m_activationTime; - CDateTime m_expirationTime; + fz::datetime m_activationTime; + fz::datetime m_expirationTime; unsigned char* m_rawData{}; unsigned int m_len{}; diff -Nru filezilla-3.14.1/src/include/socket.h filezilla-3.15.0.2/src/include/socket.h --- filezilla-3.14.1/src/include/socket.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/socket.h 2016-02-10 19:27:09.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#include "event_handler.h" +#include #include @@ -28,10 +28,10 @@ }; struct socket_event_type; -typedef CEvent CSocketEvent; +typedef fz::simple_event CSocketEvent; struct hostaddress_event_type; -typedef CEvent CHostAddressEvent; +typedef fz::simple_event CHostAddressEvent; class CCallback { @@ -39,14 +39,15 @@ virtual void cb() {} }; -void RemoveSocketEvents(CEventHandler * handler, CSocketEventSource const* const source); +void RemoveSocketEvents(fz::event_handler * handler, CSocketEventSource const* const source); +void ChangeSocketEventHandler(fz::event_handler * oldHandler, fz::event_handler * newHandler, CSocketEventSource const* const source); class CSocketThread; class CSocket final : public CSocketEventSource { friend class CSocketThread; public: - CSocket(CEventHandler* pEvtHandler); + CSocket(fz::event_handler* pEvtHandler); virtual ~CSocket(); CSocket(CSocket const&) = delete; @@ -113,8 +114,8 @@ static wxString GetErrorDescription(int error); // Can only be called if the state is none - void SetEventHandler(CEventHandler* pEvtHandler); - CEventHandler* GetEventHandler() { return m_pEvtHandler; } + void SetEventHandler(fz::event_handler* pEvtHandler); + fz::event_handler* GetEventHandler() { return m_pEvtHandler; } static void Cleanup(bool force); @@ -146,7 +147,7 @@ void DetachThread(); - CEventHandler* m_pEvtHandler; + fz::event_handler* m_pEvtHandler; int m_fd; @@ -165,7 +166,7 @@ CCallback* m_synchronous_read_cb{}; }; -#ifdef __WXMSW__ +#ifdef FZ_WINDOWS #ifndef EISCONN #define EISCONN WSAEISCONN @@ -230,6 +231,6 @@ // For the future: // Handle ERROR_NETNAME_DELETED=64 -#endif //__WXMSW__ +#endif //FZ_WINDOWS #endif //__SOCKET_H__ diff -Nru filezilla-3.14.1/src/include/timeex.h filezilla-3.15.0.2/src/include/timeex.h --- filezilla-3.14.1/src/include/timeex.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/include/timeex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -#ifndef __TIMEEX_H__ -#define __TIMEEX_H__ - -#include - -#include -#include - -#include - -class duration; - -// Represents a point of time in wallclock. -// Internal representation is in milliseconds since 1970-01-01 00:00:00.000 UTC [*] -// -// As time may come from different sources that have different accuracy/precision, -// this class keeps track of accuracy information. -// -// The Compare function can be used for accuracy-aware comparisons. Conceptually it works -// as if naively comparing both timestamps after truncating them to the most common accuracy. -// -// [*] underlying type may be TAI on some *nix, we pretend there is no difference -class CDateTime final -{ -public: - enum Accuracy : char { - days, - hours, - minutes, - seconds, - milliseconds - }; - - enum Zone { - utc, - local - }; - - CDateTime() = default; - - CDateTime(Zone z, int year, int month, int day, int hour = -1, int minute = -1, int second = -1, int millisecond = -1); - - explicit CDateTime(time_t, Accuracy a); - - // Parses string, looks for YYYYmmDDHHMMSSsss - // Ignores all non-digit characters between fields. - explicit CDateTime(wxString const& s, Zone z); - -#ifdef __WXMSW__ - explicit CDateTime(FILETIME const& ft, Accuracy a); -#endif - - CDateTime(CDateTime const& op) = default; - CDateTime(CDateTime && op) noexcept = default; - CDateTime& operator=(CDateTime const& op) = default; - CDateTime& operator=(CDateTime && op) noexcept = default; - - bool IsValid() const; - void clear(); - - Accuracy GetAccuracy() const { return a_; } - - static CDateTime Now(); - - bool operator==(CDateTime const& op) const; - bool operator!=(CDateTime const& op) const { return !(*this == op); } - bool operator<(CDateTime const& op) const; - bool operator<=(CDateTime const& op) const; - bool operator>(CDateTime const& op) const { return op < *this; } - - int Compare(CDateTime const& op) const; - bool IsEarlierThan(CDateTime const& op) const { return Compare(op) < 0; }; - bool IsLaterThan(CDateTime const& op) const { return Compare(op) > 0; }; - - CDateTime& operator+=(duration const& op); - CDateTime operator+(duration const& op) const { CDateTime t(*this); t += op; return t; } - - CDateTime& operator-=(duration const& op); - CDateTime operator-(duration const& op) const { CDateTime t(*this); t -= op; return t; } - - friend duration operator-(CDateTime const& a, CDateTime const& b); - - // Beware: month and day are 1-indexed! - bool Set(Zone z, int year, int month, int day, int hour = -1, int minute = -1, int second = -1, int millisecond = -1); - - bool Set(wxString const& str, Zone z); - -#ifdef __WXMSW__ - bool Set(FILETIME const& ft, Accuracy a); - bool Set(SYSTEMTIME const& ft, Accuracy a, Zone z); -#else - // Careful: modifies passed structure - bool Set(tm & t, Accuracy a, Zone z); -#endif - - bool ImbueTime(int hour, int minute, int second = -1, int millisecond = -1); - - static bool VerifyFormat(wxString const& fmt); - - wxString Format(wxString const& format, Zone z) const; - - int GetMilliseconds() const { return t_ % 1000; } - - time_t GetTimeT() const; - - tm GetTm(Zone z) const; - -#ifdef __WXMSW__ - FILETIME GetFileTime() const; -#endif - -private: - int CompareSlow( CDateTime const& op ) const; - - bool IsClamped(); - - enum invalid_t : int64_t { - invalid = std::numeric_limits::min() - }; - - int64_t t_{invalid}; - Accuracy a_{days}; -}; - -class duration final -{ -public: - duration() = default; - - int64_t get_days() const { return ms_ / 1000 / 3600 / 24; } - int64_t get_hours() const { return ms_ / 1000 / 3600; } - int64_t get_minutes() const { return ms_ / 1000 / 60; } - int64_t get_seconds() const { return ms_ / 1000; } - int64_t get_milliseconds() const { return ms_; } - - static duration from_minutes(int64_t m) { - return duration(m * 1000 * 60); - } - static duration from_seconds(int64_t m) { - return duration(m * 1000); - } - static duration from_milliseconds(int64_t m) { - return duration(m); - } - - duration& operator-=(duration const& op) { - ms_ -= op.ms_; - return *this; - } - - duration operator-() const { - return duration(-ms_); - } - - explicit operator bool() const { - return ms_ != 0; - } - - bool operator<(duration const& op) const { return ms_ < op.ms_; } - bool operator<=(duration const& op) const { return ms_ <= op.ms_; } - bool operator>(duration const& op) const { return ms_ > op.ms_; } - bool operator>=(duration const& op) const { return ms_ >= op.ms_; } - - friend duration operator-(duration const& a, duration const& b); -private: - explicit duration(int64_t ms) : ms_(ms) {} - - int64_t ms_{}; -}; - -inline duration operator-(duration const& a, duration const& b) -{ - return duration(a) -= b; -} - - -duration operator-(CDateTime const& a, CDateTime const& b); - -class CMonotonicClock final -{ -public: - CMonotonicClock() = default; - CMonotonicClock(CMonotonicClock const&) = default; - CMonotonicClock(CMonotonicClock &&) noexcept = default; - CMonotonicClock& operator=(CMonotonicClock const&) = default; - CMonotonicClock& operator=(CMonotonicClock &&) noexcept = default; - - CMonotonicClock const operator+(duration const& d) const - { - return CMonotonicClock(*this) += d; - } - -private: - typedef std::chrono::steady_clock clock_type; - static_assert(std::chrono::steady_clock::is_steady, "Nonconforming stdlib, your steady_clock isn't steady"); - -public: - static CMonotonicClock now() { - return CMonotonicClock(clock_type::now()); - } - - explicit operator bool() const { - return t_ != clock_type::time_point(); - } - - CMonotonicClock& operator+=(duration const& d) - { - t_ += std::chrono::milliseconds(d.get_milliseconds()); - return *this; - } - -private: - explicit CMonotonicClock(clock_type::time_point const& t) - : t_(t) - {} - - clock_type::time_point t_; - - friend duration operator-(CMonotonicClock const& a, CMonotonicClock const& b); - friend bool operator==(CMonotonicClock const& a, CMonotonicClock const& b); - friend bool operator<(CMonotonicClock const& a, CMonotonicClock const& b); - friend bool operator<=(CMonotonicClock const& a, CMonotonicClock const& b); - friend bool operator>(CMonotonicClock const& a, CMonotonicClock const& b); - friend bool operator>=(CMonotonicClock const& a, CMonotonicClock const& b); -}; - -inline duration operator-(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return duration::from_milliseconds(std::chrono::duration_cast(a.t_ - b.t_).count()); -} - -inline bool operator==(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return a.t_ == b.t_; -} - -inline bool operator<(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return a.t_ < b.t_; -} - -inline bool operator<=(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return a.t_ <= b.t_; -} - -inline bool operator>(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return a.t_ > b.t_; -} - -inline bool operator>=(CMonotonicClock const& a, CMonotonicClock const& b) -{ - return a.t_ >= b.t_; -} - -#endif //__TIMEEX_H__ diff -Nru filezilla-3.14.1/src/interface/aboutdialog.cpp filezilla-3.15.0.2/src/interface/aboutdialog.cpp --- filezilla-3.14.1/src/interface/aboutdialog.cpp 2015-06-18 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/aboutdialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -21,7 +21,7 @@ return false; xrc_call(*this, "ID_URL", &wxHyperlinkCtrl::SetLabel, _T("https://filezilla-project.org/")); - xrc_call(*this, "ID_COPYRIGHT", &wxStaticText::SetLabel, _T("Copyright (C) 2004-2015 Tim Kosse")); + xrc_call(*this, "ID_COPYRIGHT", &wxStaticText::SetLabel, _T("Copyright (C) 2004-2016 Tim Kosse")); wxString version = CBuildInfo::GetVersion(); if (CBuildInfo::GetBuildType() == _T("nightly")) diff -Nru filezilla-3.14.1/src/interface/auto_ascii_files.cpp filezilla-3.15.0.2/src/interface/auto_ascii_files.cpp --- filezilla-3.14.1/src/interface/auto_ascii_files.cpp 2015-03-21 14:25:34.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/auto_ascii_files.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,7 +1,8 @@ #include #include "auto_ascii_files.h" #include "Options.h" -#include "local_filesys.h" + +#include std::vector CAutoAsciiFiles::m_ascii_extensions; @@ -11,26 +12,21 @@ wxString extensions = COptions::Get()->GetOption(OPTION_ASCIIFILES); wxString ext; int pos = extensions.Find(_T("|")); - while (pos != -1) - { - if (!pos) - { - if (!ext.empty()) - { + while (pos != -1) { + if (!pos) { + if (!ext.empty()) { ext.Replace(_T("\\\\"), _T("\\")); m_ascii_extensions.push_back(ext); ext = _T(""); } } - else if (extensions.c_str()[pos - 1] != '\\') - { + else if (extensions.c_str()[pos - 1] != '\\') { ext += extensions.Left(pos); ext.Replace(_T("\\\\"), _T("\\")); m_ascii_extensions.push_back(ext); ext = _T(""); } - else - { + else { ext += extensions.Left(pos - 1) + _T("|"); } extensions = extensions.Mid(pos + 1); @@ -46,7 +42,7 @@ bool CAutoAsciiFiles::TransferLocalAsAscii(wxString local_file, enum ServerType server_type) { - int pos = local_file.Find(CLocalFileSystem::path_separator, true); + int pos = local_file.Find(fz::local_filesys::path_separator, true); if (pos != -1) local_file = local_file.Mid(pos + 1); diff -Nru filezilla-3.14.1/src/interface/buildinfo.cpp filezilla-3.15.0.2/src/interface/buildinfo.cpp --- filezilla-3.14.1/src/interface/buildinfo.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/buildinfo.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -52,9 +52,9 @@ return wxString(__TIME__, wxConvLocal); } -CDateTime CBuildInfo::GetBuildDate() +fz::datetime CBuildInfo::GetBuildDate() { - CDateTime date(GetBuildDateString(), CDateTime::utc); + fz::datetime date(GetBuildDateString().ToStdWstring(), fz::datetime::utc); return date; } diff -Nru filezilla-3.14.1/src/interface/buildinfo.h filezilla-3.15.0.2/src/interface/buildinfo.h --- filezilla-3.14.1/src/interface/buildinfo.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/buildinfo.h 2016-02-05 08:54:46.000000000 +0000 @@ -12,7 +12,7 @@ static int64_t ConvertToVersionNumber(const wxChar* version); static wxString GetBuildDateString(); static wxString GetBuildTimeString(); - static CDateTime GetBuildDate(); + static fz::datetime GetBuildDate(); static wxString GetBuildType(); static wxString GetCompiler(); static wxString GetCompilerFlags(); diff -Nru filezilla-3.14.1/src/interface/clearprivatedata.cpp filezilla-3.15.0.2/src/interface/clearprivatedata.cpp --- filezilla-3.14.1/src/interface/clearprivatedata.cpp 2014-07-15 11:06:07.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/clearprivatedata.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -118,7 +118,7 @@ } } -void CClearPrivateDataDialog::OnTimer(wxTimerEvent& event) +void CClearPrivateDataDialog::OnTimer(wxTimerEvent&) { const std::vector *states = CContextManager::Get()->GetAllStates(); diff -Nru filezilla-3.14.1/src/interface/commandqueue.cpp filezilla-3.15.0.2/src/interface/commandqueue.cpp --- filezilla-3.14.1/src/interface/commandqueue.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/commandqueue.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -309,7 +309,7 @@ pListing = std::make_shared(); pListing->path = listingNotification.GetPath(); pListing->m_flags |= CDirectoryListing::listing_failed; - pListing->m_firstListTime = CMonotonicClock::now(); + pListing->m_firstListTime = fz::monotonic_clock::now(); } } diff -Nru filezilla-3.14.1/src/interface/context_control.cpp filezilla-3.15.0.2/src/interface/context_control.cpp --- filezilla-3.14.1/src/interface/context_control.cpp 2015-08-14 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/context_control.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -51,55 +51,58 @@ void CContextControl::CreateTab() { wxGetApp().AddStartupProfileRecord(_T("CContextControl::CreateTab")); -#ifdef __WXMSW__ - // Some reparenting is being done when creating tabs. Reparenting of frozen windows isn't working - // on OS X. - wxWindowUpdateLocker lock(this); -#endif - - CState* pState = 0; - - // 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) - 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--; - break; - } - if (!pState) { - pState = CContextManager::Get()->CreateState(m_mainFrame); - if (!pState->CreateEngine()) { - wxMessageBoxEx(_("Failed to initialize FTP engine")); + + { + #ifdef __WXMSW__ + // Some reparenting is being done when creating tabs. Reparenting of frozen windows isn't working + // on OS X. + wxWindowUpdateLocker lock(this); + #endif + + CState* pState = 0; + + // 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) + 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--; + break; + } + if (!pState) { + pState = CContextManager::Get()->CreateState(m_mainFrame); + if (!pState->CreateEngine()) { + wxMessageBoxEx(_("Failed to initialize FTP engine")); + } } - } - // 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); - - CreateContextControls(pState); - - pState->GetRecursiveOperationHandler()->SetQueue(m_mainFrame.GetQueue()); - - wxString const localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR); - if (!pState->SetLocalDir(localDir)) { - wxString const homeDir = wxGetHomeDir(); - if (!pState->SetLocalDir(homeDir)) { - pState->SetLocalDir(_T("/")); + // 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); + + CreateContextControls(pState); + + pState->GetRecursiveOperationHandler()->SetQueue(m_mainFrame.GetQueue()); + + wxString const localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR); + if (!pState->SetLocalDir(localDir)) { + wxString const homeDir = wxGetHomeDir(); + if (!pState->SetLocalDir(homeDir)) { + pState->SetLocalDir(_T("/")); + } } - } - CContextManager::Get()->SetCurrentContext(pState); + CContextManager::Get()->SetCurrentContext(pState); + } if (!m_mainFrame.RestoreSplitterPositions()) m_mainFrame.SetDefaultSplitterPositions(); diff -Nru filezilla-3.14.1/src/interface/dndobjects.cpp filezilla-3.15.0.2/src/interface/dndobjects.cpp --- filezilla-3.14.1/src/interface/dndobjects.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/dndobjects.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -39,7 +39,7 @@ CloseHandle(m_hMutex); if (!m_dragDirectory.empty()) - RemoveDirectory(m_dragDirectory); + RemoveDirectory(m_dragDirectory.wc_str()); } wxString CShellExtensionInterface::InitDrag() @@ -137,10 +137,10 @@ bool CShellExtensionInterface::CreateDragDirectory() { for (int i = 0; i < 10; ++i) { - auto const now = CDateTime::Now(); - int64_t value = now.GetTimeT(); + auto const now = fz::datetime::now(); + int64_t value = now.get_time_t(); value *= 1000; - value += now.GetMilliseconds(); + value += now.get_milliseconds(); value *= 10; value += i; @@ -151,7 +151,7 @@ if (dir.Len() > MAX_PATH) return false; - if (CreateDirectory(dir, 0)) { + if (CreateDirectory(dir.wc_str(), 0)) { m_dragDirectory = dir; return true; } diff -Nru filezilla-3.14.1/src/interface/edithandler.cpp filezilla-3.15.0.2/src/interface/edithandler.cpp --- filezilla-3.14.1/src/interface/edithandler.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/edithandler.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,12 +4,13 @@ #include "edithandler.h" #include "filezillaapp.h" #include "file_utils.h" -#include "local_filesys.h" #include "Options.h" #include "queue.h" #include "window_state_manager.h" #include "xrc_helper.h" +#include + class CChangedFileDialog : public wxDialogEx { DECLARE_EVENT_TABLE() @@ -101,7 +102,7 @@ if (fd >= 0) { // Try to lock 1 byte region in the lockfile. m_type specifies the byte to lock. - struct flock f = { 0 }; + struct flock f = {}; f.l_type = F_WRLCK; f.l_whence = SEEK_SET; f.l_start = 0; @@ -178,7 +179,7 @@ RemoveTemporaryFiles(dir); #ifdef __WXMSW__ - m_lockfile_handle = ::CreateFile(m_localDir + _T("fz3temp-lockfile"), GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_TEMPORARY, 0); + 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) { wxRmdir(m_localDir); @@ -190,7 +191,7 @@ if (m_lockfile_descriptor >= 0) { // Lock 1 byte region in the lockfile. - struct flock f = {0}; + struct flock f = {}; f.l_type = F_WRLCK; f.l_whence = SEEK_SET; f.l_start = 0; @@ -487,7 +488,7 @@ return iter; } -void CEditHandler::FinishTransfer(bool successful, const wxString& fileName) +void CEditHandler::FinishTransfer(bool, const wxString& fileName) { auto iter = GetFile(fileName); if (iter == m_fileDataList[local].end()) @@ -585,7 +586,7 @@ wxASSERT(data.state == edit); bool is_link; - if (CLocalFileSystem::GetFileInfo(data.file, is_link, 0, &data.modificationTime, 0) != CLocalFileSystem::file) + if (fz::local_filesys::get_file_info(fz::to_native(data.file), is_link, 0, &data.modificationTime, 0) != fz::local_filesys::file) return false; bool program_exists = false; @@ -618,19 +619,19 @@ if (iter->state != edit) continue; - CDateTime mtime; + fz::datetime mtime; bool is_link; - if (CLocalFileSystem::GetFileInfo(iter->file, is_link, 0, &mtime, 0) != CLocalFileSystem::file) { + if (fz::local_filesys::get_file_info(fz::to_native(iter->file), is_link, 0, &mtime, 0) != fz::local_filesys::file) { m_fileDataList[i].erase(iter); // Evil goto. Imo the next C++ standard needs a comefrom keyword. goto checkmodifications_loopbegin; } - if (!mtime.IsValid()) + if (!mtime.empty()) continue; - if (iter->modificationTime.IsValid() && !iter->modificationTime.Compare(mtime)) + if (iter->modificationTime.empty() && !iter->modificationTime.compare(mtime)) continue; // File has changed, ask user what to do @@ -659,7 +660,7 @@ } else if (remove) { if (i == static_cast(remote)) { - if (CLocalFileSystem::GetFileInfo(iter->file, is_link, 0, &mtime, 0) != CLocalFileSystem::file || wxRemoveFile(iter->file)) { + if (fz::local_filesys::get_file_info(fz::to_native(iter->file), is_link, 0, &mtime, 0) != fz::local_filesys::file || wxRemoveFile(iter->file)) { m_fileDataList[i].erase(iter); goto checkmodifications_loopbegin; } @@ -670,7 +671,7 @@ goto checkmodifications_loopbegin; } } - else if (CLocalFileSystem::GetFileInfo(iter->file, is_link, 0, &mtime, 0) != CLocalFileSystem::file) { + else if (fz::local_filesys::get_file_info(fz::to_native(iter->file), is_link, 0, &mtime, 0) != fz::local_filesys::file) { m_fileDataList[i].erase(iter); goto checkmodifications_loopbegin; } @@ -753,17 +754,16 @@ iter->state = unedit ? upload_and_remove : upload; int64_t size; - CDateTime mtime; + fz::datetime mtime; bool is_link; - if (CLocalFileSystem::GetFileInfo(iter->file, is_link, &size, &mtime, 0) != CLocalFileSystem::file) - { + if (fz::local_filesys::get_file_info(fz::to_native(iter->file), is_link, &size, &mtime, 0) != fz::local_filesys::file) { m_fileDataList[type].erase(iter); return false; } - if (!mtime.IsValid()) - mtime = CDateTime::Now(); + if (!mtime.empty()) + mtime = fz::datetime::now(); iter->modificationTime = mtime; diff -Nru filezilla-3.14.1/src/interface/edithandler.h filezilla-3.15.0.2/src/interface/edithandler.h --- filezilla-3.14.1/src/interface/edithandler.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/edithandler.h 2016-02-05 08:54:46.000000000 +0000 @@ -102,7 +102,7 @@ wxString name; // The name of the file wxString file; // The actual local filename fileState state; - CDateTime modificationTime; + fz::datetime modificationTime; CServerPath remotePath; CServer server; }; diff -Nru filezilla-3.14.1/src/interface/fileexistsdlg.cpp filezilla-3.15.0.2/src/interface/fileexistsdlg.cpp --- filezilla-3.14.1/src/interface/fileexistsdlg.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/fileexistsdlg.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -35,7 +35,7 @@ return true; } -void CFileExistsDlg::DisplayFile(bool left, wxString name, int64_t size, CDateTime const& time, wxString const& iconFile) +void CFileExistsDlg::DisplayFile(bool left, wxString name, int64_t size, fz::datetime const& time, wxString const& iconFile) { name = GetPathEllipsis(name, FindWindow(left ? XRCID("ID_FILE1_NAME") : XRCID("ID_FILE2_NAME"))); name.Replace(_T("&"), _T("&&")); @@ -47,7 +47,7 @@ } wxString timeStr = _("Date/time unknown"); - if (time.IsValid()) + if (time.empty()) timeStr = CTimeFormat::Format(time); xrc_call(*this, left ? "ID_FILE1_NAME" : "ID_FILE2_NAME", &wxStaticText::SetLabel, name); @@ -88,7 +88,7 @@ #ifdef __WXMSW__ SHFILEINFO fileinfo; memset(&fileinfo, 0, sizeof(fileinfo)); - if (SHGetFileInfo(file, FILE_ATTRIBUTE_NORMAL, &fileinfo, sizeof(fileinfo), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES)) { + if (SHGetFileInfo(file.wc_str(), FILE_ATTRIBUTE_NORMAL, &fileinfo, sizeof(fileinfo), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES)) { wxBitmap bmp; bmp.Create(size.x, size.y); @@ -163,7 +163,7 @@ } } -void CFileExistsDlg::OnOK(wxCommandEvent& event) +void CFileExistsDlg::OnOK(wxCommandEvent&) { if (xrc_call(*this, "ID_ACTION1", &wxRadioButton::GetValue)) m_action = CFileExistsNotification::overwrite; @@ -193,7 +193,7 @@ return m_action; } -void CFileExistsDlg::OnCancel(wxCommandEvent& event) +void CFileExistsDlg::OnCancel(wxCommandEvent&) { m_action = CFileExistsNotification::skip; EndModal(wxID_CANCEL); diff -Nru filezilla-3.14.1/src/interface/fileexistsdlg.h filezilla-3.15.0.2/src/interface/fileexistsdlg.h --- filezilla-3.14.1/src/interface/fileexistsdlg.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/fileexistsdlg.h 2016-02-05 08:54:46.000000000 +0000 @@ -21,7 +21,7 @@ /// Creates the controls and sizers bool CreateControls(); - void DisplayFile(bool left, wxString name, int64_t size, CDateTime const& time, wxString const& iconFile); + void DisplayFile(bool left, wxString name, int64_t size, fz::datetime const& time, wxString const& iconFile); void OnOK(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); diff -Nru filezilla-3.14.1/src/interface/filelistctrl.cpp filezilla-3.15.0.2/src/interface/filelistctrl.cpp --- filezilla-3.14.1/src/interface/filelistctrl.cpp 2015-07-01 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filelistctrl.cpp 2016-02-09 15:58:25.000000000 +0000 @@ -260,7 +260,7 @@ m_focusItem = -1; #endif -#if defined __WXGTK__ && !defined(__WXGTK3__) +#if defined(__WXGTK__) && !defined(__WXGTK3__) m_gtkEventCallbackProxy.reset(new CGtkEventCallbackProxy(this)); GtkWidget* widget = GetMainWindow()->GetConnectWidget(); @@ -284,8 +284,7 @@ { CancelLabelEdit(); - if (column != -1) - { + if (column != -1) { if (column != m_sortColumn) { const int oldVisibleColumn = GetColumnVisibleIndex(m_sortColumn); @@ -300,8 +299,7 @@ direction = m_sortDirection; int newVisibleColumn = GetColumnVisibleIndex(column); - if (newVisibleColumn == -1) - { + if (newVisibleColumn == -1) { newVisibleColumn = 0; column = 0; } @@ -310,24 +308,29 @@ // Remember which files are selected bool *selected = 0; - int focused = -1; - if (updateSelections) - { - selected = new bool[m_fileData.size()]; - memset(selected, 0, sizeof(bool) * m_fileData.size()); + int focused_item = -1; + unsigned int focused_index{}; + if (updateSelections) { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) if (GetSelectedItemCount()) #endif { - int item = -1; - while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) - selected[m_indexMapping[item]] = 1; + int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + 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); + } while (item != -1); + } } - focused = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if (focused != -1) - focused = m_indexMapping[focused]; + focused_item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); + if (focused_item != -1) + focused_index = m_indexMapping[focused_item]; } const int dirSortOption = COptions::Get()->GetOptionVal(OPTION_FILELIST_DIRSORT); @@ -343,9 +346,8 @@ ++start; std::reverse(start, m_indexMapping.end()); - if (updateSelections) - { - SortList_UpdateSelections(selected, focused); + if (updateSelections) { + SortList_UpdateSelections(selected, focused_item, focused_index); delete [] selected; } @@ -356,10 +358,8 @@ m_sortColumn = column; const unsigned int minsize = m_hasParent ? 3 : 2; - if (m_indexMapping.size() < minsize) - { - if (updateSelections) - delete [] selected; + if (m_indexMapping.size() < minsize) { + delete [] selected; return; } @@ -370,33 +370,34 @@ std::sort(start, m_indexMapping.end(), object); object.Destroy(); - if (updateSelections) - { - SortList_UpdateSelections(selected, focused); + if (updateSelections) { + SortList_UpdateSelections(selected, focused_item, focused_index); delete [] selected; } } -template void CFileListCtrl::SortList_UpdateSelections(bool* selections, int focus) +template void CFileListCtrl::SortList_UpdateSelections(bool* selections, int focused_item, unsigned int focused_index) { - for (unsigned int i = m_hasParent ? 1 : 0; i < m_indexMapping.size(); i++) - { - const int state = GetItemState(i, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); - const bool selected = (state & wxLIST_STATE_SELECTED) != 0; - const bool focused = (state & wxLIST_STATE_FOCUSED) != 0; - - int item = m_indexMapping[i]; - if (selections[item] != selected) - SetSelection(i, selections[item]); - if (focused) - { - if (item != focus) - SetItemState(i, 0, wxLIST_STATE_FOCUSED); + if (focused_item >= 0) { + if (m_indexMapping[focused_item] != focused_index) { + SetItemState(focused_item, 0, wxLIST_STATE_FOCUSED); + + for (unsigned int i = m_hasParent ? 1 : 0; i < m_indexMapping.size(); ++i) { + if (m_indexMapping[i] == focused_index) { + SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + } + } } - else - { - if (item == focus) - SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + } + + 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) + SetSelection(i, selections[item]); } } } @@ -485,7 +486,7 @@ wxString ret; int pos = file.Find('.', true); - if (pos > 0 && file[pos + 1] != 0) // 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; @@ -513,7 +514,7 @@ SHFILEINFO shFinfo; memset(&shFinfo, 0, sizeof(SHFILEINFO)); - if (SHGetFileInfo(name, + if (SHGetFileInfo(name.wc_str(), dir ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL, &shFinfo, sizeof(shFinfo), diff -Nru filezilla-3.14.1/src/interface/filelistctrl.h filezilla-3.15.0.2/src/interface/filelistctrl.h --- filezilla-3.14.1/src/interface/filelistctrl.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filelistctrl.h 2016-02-05 08:54:46.000000000 +0000 @@ -64,7 +64,7 @@ return false;\ } - static int CmpCase(fzstring const& str1, fzstring const& str2) + static int CmpCase(std::wstring const& str1, std::wstring const& str2) { return str1.compare(str2); } @@ -74,9 +74,9 @@ return str1.Cmp(str2); } - static int CmpNoCase(fzstring const& str1, fzstring const& str2) + static int CmpNoCase(std::wstring const& str1, std::wstring const& str2) { - int cmp = collate_fzstring(str1, str2); + int cmp = fz::stricmp(str1, str2); if (cmp) return cmp; return str1.compare(str2); @@ -95,7 +95,7 @@ return CmpNatural(static_cast(str1.c_str()), static_cast(str2.c_str())); } - static int CmpNatural(fzstring const& str1, fzstring const& str2) + static int CmpNatural(std::wstring const& str1, std::wstring const& str2) { return CmpNatural(str1.c_str(), str2.c_str()); } @@ -580,7 +580,7 @@ #endif private: - void SortList_UpdateSelections(bool* selections, int focus); + 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; diff -Nru filezilla-3.14.1/src/interface/filelist_statusbar.cpp filezilla-3.15.0.2/src/interface/filelist_statusbar.cpp --- filezilla-3.14.1/src/interface/filelist_statusbar.cpp 2015-03-28 04:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filelist_statusbar.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -161,7 +161,7 @@ TriggerUpdateText(); } -void CFilelistStatusBar::OnTimer(wxTimerEvent& event) +void CFilelistStatusBar::OnTimer(wxTimerEvent&) { UpdateText(); } @@ -224,7 +224,7 @@ TriggerUpdateText(); } -void CFilelistStatusBar::OnOptionsChanged(changed_options_t const& options) +void CFilelistStatusBar::OnOptionsChanged(changed_options_t const&) { TriggerUpdateText(); } diff -Nru filezilla-3.14.1/src/interface/file_utils.cpp filezilla-3.15.0.2/src/interface/file_utils.cpp --- filezilla-3.14.1/src/interface/file_utils.cpp 2015-04-22 13:03:42.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/file_utils.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -290,7 +290,7 @@ (to.Find('>') != -1) || (to.Find('|') != -1)) { - wxMessageBoxEx(_("Filenames may not contain any of the following characters: / \\ : * ? \" < > |"), _("Invalid filename"), wxICON_EXCLAMATION); + wxMessageBoxEx(_("Filenames may not contain any of the following characters: / \\ : * ? \" < > |"), _("Invalid filename"), wxICON_EXCLAMATION, parent); return false; } @@ -299,10 +299,10 @@ from = dir + from + _T(" "); from.SetChar(from.Length() - 1, '\0'); - op.pFrom = from; + op.pFrom = from.wc_str(); to = dir + to + _T(" "); to.SetChar(to.Length()-1, '\0'); - op.pTo = to; + op.pTo = to.wc_str(); op.hwnd = (HWND)parent->GetHandle(); op.wFunc = FO_RENAME; op.fFlags = FOF_ALLOWUNDO; @@ -315,7 +315,7 @@ (to.Find('>') != -1) || (to.Find('|') != -1)) { - wxMessageBoxEx(_("Filenames may not contain any of the following characters: / * ? < > |"), _("Invalid filename"), wxICON_EXCLAMATION); + wxMessageBoxEx(_("Filenames may not contain any of the following characters: / * ? < > |"), _("Invalid filename"), wxICON_EXCLAMATION, parent); return false; } diff -Nru filezilla-3.14.1/src/interface/file_utils.h filezilla-3.15.0.2/src/interface/file_utils.h --- filezilla-3.14.1/src/interface/file_utils.h 2014-05-01 19:29:21.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/file_utils.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,6 +1,8 @@ #ifndef FILEZILLA_FILE_UTILS_HEADER #define FILEZILLA_FILE_UTILS_HEADER +#include + bool UnquoteCommand(wxString& command, wxString& arguments, bool is_dde = false); bool ProgramExists(const wxString& editor); bool PathExpand(wxString& cmd); @@ -17,4 +19,37 @@ CLocalPath GetDownloadDir(); +class gui_recursive_remove : public fz::recursive_remove +{ +public: + gui_recursive_remove(wxWindow* parent) + : parent_(parent) + {} + +#ifdef FZ_WINDOWS + virtual void adjust_shfileop(SHFILEOPSTRUCT & op) + { + op.hwnd = parent_ ? (HWND)parent_->GetHandle() : 0; + if (parent_) { + // Move to trash if shift is not pressed, else delete + op.fFlags = wxGetKeyState(WXK_SHIFT) ? 0 : FOF_ALLOWUNDO; + } + else { + recursive_remove::adjust_shfileop(op); + } + } +#endif + + virtual bool confirm() const { + if (parent_) { + if (wxMessageBoxEx(_("Really delete all selected files and/or directories from your computer?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, parent_) != wxYES) + return false; + } + return true; + } + +private: + wxWindow* parent_; +}; + #endif diff -Nru filezilla-3.14.1/src/interface/FileZilla.cpp filezilla-3.15.0.2/src/interface/FileZilla.cpp --- filezilla-3.14.1/src/interface/FileZilla.cpp 2015-07-23 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/FileZilla.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -11,7 +11,8 @@ #include "cmdline.h" #include "welcome_dialog.h" #include -#include "local_filesys.h" + +#include #include #include @@ -39,7 +40,6 @@ #include #include "xh_toolb_ex.h" #ifdef __WXMSW__ -#include #include #endif #ifdef WITH_LIBDBUS @@ -75,9 +75,10 @@ } #ifdef __WXMSW__ +namespace { extern "C" { - typedef HRESULT (WINAPI *t_SetCurrentProcessExplicitAppUserModelID)(PCWSTR AppID); + typedef HRESULT(WINAPI *t_SetCurrentProcessExplicitAppUserModelID)(PCWSTR AppID); } static void SetAppId() @@ -98,6 +99,26 @@ pSetCurrentProcessExplicitAppUserModelID(_T("FileZilla.Client.AppID")); } +static bool InitWinsock() +{ + WSADATA d{}; + int res = WSAStartup((2 << 8) | 8, &d); + if (res != 0) { + int err = WSAGetLastError(); + wxString msg = wxString::Format(_("Could not initialize Winsock (%d): %s"), err, wxSysErrorMsg(err)); + wxMessageBoxEx(msg, _("Failed to initialize networking"), wxICON_EXCLAMATION); + return false; + } + + return true; +} + +static void UninitWinsock() +{ + WSACleanup(); +} +} + #endif //__WXMSW__ void CFileZillaApp::InitLocale() @@ -164,8 +185,9 @@ srand( (unsigned)time( NULL ) ); #ifdef __WXMSW__ - // Need to call WSAStartup. Let wx do that for us - wxSocketBase::Initialize(); + if (!InitWinsock()) { + return false; + } SetAppId(); #endif @@ -268,7 +290,7 @@ CSessionManager::Uninit(); #endif #ifdef __WXMSW__ - wxSocketBase::Shutdown(); + UninitWinsock(); #endif return wxApp::OnExit(); } @@ -444,17 +466,17 @@ pResource->AddHandler(new wxAnimationCtrlXmlHandler); pResource->AddHandler(new wxStdDialogButtonSizerXmlHandler); - if (CLocalFileSystem::GetFileType(m_resourceDir.GetPath() + _T("xrc/resources.xrc")) == CLocalFileSystem::file) { + 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 { - CLocalFileSystem fs; + fz::local_filesys fs; wxString dir = m_resourceDir.GetPath() + _T("xrc/"); - bool found = fs.BeginFindFiles(dir, false); + bool found = fs.begin_find_files(fz::to_native(dir), false); while (found) { - wxString name; - found = fs.GetNextFile(name); - if (name.Right(4) != _T(".xrc")) { + 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); diff -Nru filezilla-3.14.1/src/interface/filezilla.h filezilla-3.15.0.2/src/interface/filezilla.h --- filezilla-3.14.1/src/interface/filezilla.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filezilla.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef __FILEZILLA_H__ #define __FILEZILLA_H__ -#include +#include #include #ifndef PACKAGE_NAME diff -Nru filezilla-3.14.1/src/interface/filter_conditions_dialog.cpp filezilla-3.15.0.2/src/interface/filter_conditions_dialog.cpp --- filezilla-3.14.1/src/interface/filter_conditions_dialog.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filter_conditions_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -610,8 +610,8 @@ continue; else { condition.strValue = controls.pValue->GetValue(); - condition.date = CDateTime(condition.strValue, CDateTime::local); - if (!condition.date.IsValid()) { + condition.date = fz::datetime(condition.strValue.ToStdWstring(), fz::datetime::local); + if (!condition.date.empty()) { continue; } } diff -Nru filezilla-3.14.1/src/interface/filter.cpp filezilla-3.15.0.2/src/interface/filter.cpp --- filezilla-3.14.1/src/interface/filter.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filter.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,12 +4,13 @@ #include "filezillaapp.h" #include "inputdialog.h" #include "ipcmutex.h" -#include "local_filesys.h" #include "Mainfrm.h" #include "Options.h" #include "state.h" #include "xmlfunctions.h" +#include + #include bool CFilterManager::m_loaded = false; @@ -125,12 +126,12 @@ } } -void CFilterDialog::OnCancel(wxCommandEvent& event) +void CFilterDialog::OnCancel(wxCommandEvent&) { EndModal(wxID_CANCEL); } -void CFilterDialog::OnEdit(wxCommandEvent& event) +void CFilterDialog::OnEdit(wxCommandEvent&) { CFilterEditDialog dlg; if (!dlg.Create(this, m_filters, m_filterSets)) @@ -327,7 +328,7 @@ m_filterSets[0].remote[item] = remoteChecked; } -void CFilterDialog::OnSaveAs(wxCommandEvent& event) +void CFilterDialog::OnSaveAs(wxCommandEvent&) { CInputDialog dlg; dlg.Create(this, _("Enter name for filterset"), _("Please enter a unique name for this filter set")); @@ -372,7 +373,7 @@ GetSizer()->Fit(this); } -void CFilterDialog::OnRename(wxCommandEvent& event) +void CFilterDialog::OnRename(wxCommandEvent&) { wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice); int old_pos = pChoice->GetSelection(); @@ -432,7 +433,7 @@ GetSizer()->Fit(this); } -void CFilterDialog::OnDeleteSet(wxCommandEvent& event) +void CFilterDialog::OnDeleteSet(wxCommandEvent&) { wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice); int pos = pChoice->GetSelection(); @@ -566,7 +567,7 @@ return true; } -bool CFilterManager::FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const +bool CFilterManager::FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const { if (m_filters_disabled) return false; @@ -592,7 +593,7 @@ return false; } -bool CFilterManager::FilenameFiltered(std::vector const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const +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 { for (auto const& filter : filters) { if (FilenameFilteredByFilter(filter, name, path, dir, size, attributes, date)) @@ -674,7 +675,7 @@ return match; } -bool CFilterManager::FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, CDateTime const& date) +bool CFilterManager::FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) { if (dir && !filter.filterDirs) return false; @@ -801,8 +802,8 @@ #endif //__WXMSW__ break; case filter_date: - if (date.IsValid()) { - int cmp = date.Compare( condition.date ); + if (date.empty()) { + int cmp = date.compare( condition.date ); switch (condition.condition) { case 0: // Before @@ -937,8 +938,8 @@ condition.value = 1; } else if (condition.type == filter_date) { - condition.date = CDateTime(condition.strValue, CDateTime::local); - if (!condition.date.IsValid()) { + condition.date = fz::datetime(condition.strValue.ToStdWstring(), fz::datetime::local); + if (!condition.date.empty()) { continue; } } @@ -959,7 +960,7 @@ CInterProcessMutex mutex(MUTEX_FILTERS); wxString file(wxGetApp().GetSettingsFile(_T("filters"))); - if (CLocalFileSystem::GetSize(file) < 1) { + if (fz::local_filesys::get_size(fz::to_native(file)) < 1) { file = wxGetApp().GetResourceDir().GetPath() + _T("defaultfilters.xml"); } diff -Nru filezilla-3.14.1/src/interface/filteredit.cpp filezilla-3.15.0.2/src/interface/filteredit.cpp --- filezilla-3.14.1/src/interface/filteredit.cpp 2015-07-07 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filteredit.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -30,7 +30,7 @@ } } -void CFilterEditDialog::OnOK(wxCommandEvent& event) +void CFilterEditDialog::OnOK(wxCommandEvent&) { if (!Validate()) return; @@ -52,7 +52,7 @@ EndModal(wxID_OK); } -void CFilterEditDialog::OnCancel(wxCommandEvent& event) +void CFilterEditDialog::OnCancel(wxCommandEvent&) { EndModal(wxID_CANCEL); } @@ -168,7 +168,7 @@ OnFilterSelect(evt); } -void CFilterEditDialog::OnDelete(wxCommandEvent& event) +void CFilterEditDialog::OnDelete(wxCommandEvent&) { int item = m_pFilterListCtrl->GetSelection(); if (item == -1) @@ -190,7 +190,7 @@ SetCtrlState(false); } -void CFilterEditDialog::OnRename(wxCommandEvent& event) +void CFilterEditDialog::OnRename(wxCommandEvent&) { const wxString& oldName = XRCCTRL(*this, "ID_NAME", wxTextCtrl)->GetValue(); wxTextEntryDialog *pDlg = new wxTextEntryDialog(this, _("Please enter a new name for the filter."), _("Enter filter name"), oldName); @@ -223,7 +223,7 @@ m_pFilterListCtrl->Select(m_currentSelection); } -void CFilterEditDialog::OnCopy(wxCommandEvent& event) +void CFilterEditDialog::OnCopy(wxCommandEvent&) { if (m_currentSelection == -1) return; @@ -274,7 +274,7 @@ OnFilterSelect(evt); } -void CFilterEditDialog::OnFilterSelect(wxCommandEvent& event) +void CFilterEditDialog::OnFilterSelect(wxCommandEvent&) { int item = m_pFilterListCtrl->GetSelection(); if (item == -1) { diff -Nru filezilla-3.14.1/src/interface/filter.h filezilla-3.15.0.2/src/interface/filter.h --- filezilla-3.14.1/src/interface/filter.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/filter.h 2016-02-05 08:54:46.000000000 +0000 @@ -34,7 +34,7 @@ wxString strValue; // All other types int64_t value; // If type is size - CDateTime date; // If type is date + fz::datetime date; // If type is date bool matchCase; std::shared_ptr pRegEx; }; @@ -80,9 +80,9 @@ virtual ~CFilterManager() {} // Note: Under non-windows, attributes are permissions - bool FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const; - bool FilenameFiltered(std::vector const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const; - static bool FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, CDateTime const& date); + 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); static bool HasActiveFilters(bool ignore_disabled = false); bool HasSameLocalAndRemoteFilters() const; diff -Nru filezilla-3.14.1/src/interface/fzputtygen_interface.cpp filezilla-3.15.0.2/src/interface/fzputtygen_interface.cpp --- filezilla-3.14.1/src/interface/fzputtygen_interface.cpp 2015-09-02 16:56:54.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/fzputtygen_interface.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -64,7 +64,7 @@ return reply == _T("convertible") ? 1 : 0; } -int CFZPuttyGenInterface::IsKeyFileEncrypted(wxString keyFile, bool silent) +int CFZPuttyGenInterface::IsKeyFileEncrypted() { if (!Send(_T("encrypted"))) return -1; @@ -89,15 +89,14 @@ if (needs_conversion < 0) { return false; } - - wxString reply; + ReplyCode code; if (needs_conversion) { if (silent) { return false; } - int encrypted = IsKeyFileEncrypted(keyFile, silent); + int encrypted = IsKeyFileEncrypted(); if (encrypted < 0) { return false; } @@ -214,7 +213,7 @@ if (!m_pProcess) return false; - const wxWX2MBbuf buf = (cmd + _T("\n")).mb_str(); + const wxWX2MBbuf buf = (cmd + _T("\n")).mb_str(wxConvUTF8); const size_t len = strlen (buf); wxOutputStream* stream = m_pProcess->GetOutputStream(); diff -Nru filezilla-3.14.1/src/interface/fzputtygen_interface.h filezilla-3.15.0.2/src/interface/fzputtygen_interface.h --- filezilla-3.14.1/src/interface/fzputtygen_interface.h 2015-08-05 14:40:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/fzputtygen_interface.h 2016-02-05 08:54:46.000000000 +0000 @@ -3,7 +3,7 @@ #include -class CFZPuttyGenInterface +class CFZPuttyGenInterface final { public: CFZPuttyGenInterface(wxWindow* parent); @@ -20,12 +20,12 @@ int NeedsConversion(wxString keyFile, bool silent); // return -1 on error - int IsKeyFileEncrypted(wxString keyFile, bool silent); + int IsKeyFileEncrypted(); wxProcess* m_pProcess{}; bool m_initialized{}; wxWindow* m_parent; - + enum ReplyCode { success, error, diff -Nru filezilla-3.14.1/src/interface/inputdialog.cpp filezilla-3.15.0.2/src/interface/inputdialog.cpp --- filezilla-3.14.1/src/interface/inputdialog.cpp 2014-10-21 12:20:14.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/inputdialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -61,7 +61,7 @@ XRCCTRL(*this, "wxID_OK", wxButton)->Enable(m_allowEmpty ? true : (m_pTextCtrl->GetValue() != _T(""))); } -void CInputDialog::OnValueChanged(wxCommandEvent& event) +void CInputDialog::OnValueChanged(wxCommandEvent&) { wxString value = m_pTextCtrl->GetValue(); XRCCTRL(*this, "wxID_OK", wxButton)->Enable(m_allowEmpty ? true : !value.empty()); @@ -87,12 +87,12 @@ return true; } -void CInputDialog::OnOK(wxCommandEvent& event) +void CInputDialog::OnOK(wxCommandEvent&) { EndModal(wxID_OK); } -void CInputDialog::OnCancel(wxCommandEvent& event) +void CInputDialog::OnCancel(wxCommandEvent&) { EndModal(wxID_CANCEL); } diff -Nru filezilla-3.14.1/src/interface/interface.vcxproj filezilla-3.15.0.2/src/interface/interface.vcxproj --- filezilla-3.14.1/src/interface/interface.vcxproj 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/interface.vcxproj 2016-02-05 08:54:46.000000000 +0000 @@ -55,14 +55,6 @@ false - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/FileZilla.tlb - - /MP -Zm200 %(AdditionalOptions) Disabled @@ -87,7 +79,7 @@ 0x0407 - libgnutls-28.lib;normaliz.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;..\engine\Debug\engine.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) + 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) true .\Debug/FileZilla_dbg.pdb ..\bin\FileZilla_dbg.exe @@ -102,14 +94,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/FileZilla.tlb - - /MP %(AdditionalOptions) MaxSpeed @@ -137,7 +121,7 @@ 0x0407 - libgnutls-28.lib;normaliz.lib;wsock32.lib;odbc32.lib;odbccp32.lib;comctl32.lib;..\engine\Release\engine.lib;Netapi32.lib;Winmm.lib;Ws2_32.lib;mpr.lib;sqlite3.lib;powrprof.lib;%(AdditionalDependencies) + 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) true true .\Release/FileZilla.pdb diff -Nru filezilla-3.14.1/src/interface/ipcmutex.cpp filezilla-3.15.0.2/src/interface/ipcmutex.cpp --- filezilla-3.14.1/src/interface/ipcmutex.cpp 2014-11-06 04:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/ipcmutex.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -15,7 +15,7 @@ m_locked = false; #ifdef __WXMSW__ // Create mutex_ - hMutex = ::CreateMutex(0, false, wxString::Format(_T("FileZilla 3 Mutex Type %d"), mutexType)); + hMutex = ::CreateMutex(0, false, wxString::Format(_T("FileZilla 3 Mutex Type %d"), mutexType).wc_str()); #else if (!m_instanceCount) { // Open file only if this is the first instance @@ -55,7 +55,7 @@ if (m_fd >= 0) { // Lock 1 byte region in the lockfile. m_type specifies the byte to lock. - struct flock f = {0}; + struct flock f = {}; f.l_type = F_WRLCK; f.l_whence = SEEK_SET; f.l_start = m_type; @@ -99,7 +99,7 @@ if (m_fd >= 0) { // Try to lock 1 byte region in the lockfile. m_type specifies the byte to lock. - struct flock f = {0}; + struct flock f = {}; f.l_type = F_WRLCK; f.l_whence = SEEK_SET; f.l_start = m_type; @@ -138,7 +138,7 @@ if (m_fd >= 0) { // Unlock region specified by m_type. - struct flock f = {0}; + struct flock f = {}; f.l_type = F_UNLCK; f.l_whence = SEEK_SET; f.l_start = m_type; diff -Nru filezilla-3.14.1/src/interface/listctrlex.cpp filezilla-3.15.0.2/src/interface/listctrlex.cpp --- filezilla-3.14.1/src/interface/listctrlex.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/listctrlex.cpp 2016-02-09 18:50:17.000000000 +0000 @@ -151,9 +151,9 @@ wxASSERT(character); // Keyboard navigation within items - CDateTime now = CDateTime::Now(); - if (m_prefixSearch_lastKeyPress.IsValid()) { - duration span = now - m_prefixSearch_lastKeyPress; + fz::datetime now = fz::datetime::now(); + if (m_prefixSearch_lastKeyPress.empty()) { + fz::duration span = now - m_prefixSearch_lastKeyPress; if (span.get_seconds() >= 1) { m_prefixSearch_prefix = _T(""); } @@ -535,30 +535,23 @@ return true; } - const unsigned int count = m_columnInfo.size(); + size_t const columnCount = m_columnInfo.size(); wxString savedWidths = COptions::Get()->GetOption(optionId); wxStringTokenizer tokens(savedWidths, _T(" ")); - if (tokens.CountTokens() < count) - return false; - unsigned long* newWidths = new unsigned long[count]; - for (unsigned int i = 0; i < count; i++) - { - wxString token = tokens.GetNextToken(); - if (!token.ToULong(newWidths + i) || newWidths[i] > 5000) - { - delete [] newWidths; - return false; + size_t const tokenCount = tokens.CountTokens(); + + for (size_t i = 0; i < columnCount; ++i) { + unsigned long newWidth{}; + if (i < tokenCount) { + wxString token = tokens.GetNextToken(); + if (token.ToULong(&newWidth) && newWidth < 10000) { + m_columnInfo[i].width = newWidth; + } } - else if (newWidths[i] < MIN_COLUMN_WIDTH) - newWidths[i] = MIN_COLUMN_WIDTH; } - for (unsigned int i = 0; i < count; i++) - m_columnInfo[i].width = newWidths[i]; - - delete [] newWidths; return true; } @@ -567,13 +560,11 @@ const unsigned int count = m_columnInfo.size(); wxString widths; - for (unsigned int i = 0; i < count; i++) - { + for (unsigned int i = 0; i < count; ++i) { int width = 0; bool found = false; - for (int j = 0; j < GetColumnCount(); j++) - { + for (int j = 0; j < GetColumnCount(); ++j) { if (m_pVisibleColumnMapping[j] != i) continue; @@ -590,7 +581,7 @@ } -void wxListCtrlEx::AddColumn(const wxString& name, int align, int initialWidth, bool fixed /*=false*/) +void wxListCtrlEx::AddColumn(const wxString& name, int align, int initialWidth, bool fixed) { wxASSERT(!GetColumnCount()); @@ -691,7 +682,7 @@ DECLARE_EVENT_TABLE() protected: - void OnUp(wxCommandEvent& event) + void OnUp(wxCommandEvent&) { wxCheckListBox* pListBox = XRCCTRL(*this, "ID_ACTIVE", wxCheckListBox); int sel = pListBox->GetSelection(); @@ -714,7 +705,7 @@ OnSelChanged(evt); } - void OnDown(wxCommandEvent& event) + void OnDown(wxCommandEvent&) { wxCheckListBox* pListBox = XRCCTRL(*this, "ID_ACTIVE", wxCheckListBox); int sel = pListBox->GetSelection(); @@ -739,7 +730,7 @@ OnSelChanged(evt); } - void OnSelChanged(wxCommandEvent& event) + void OnSelChanged(wxCommandEvent&) { wxCheckListBox* pListBox = XRCCTRL(*this, "ID_ACTIVE", wxCheckListBox); int sel = pListBox->GetSelection(); @@ -1056,12 +1047,12 @@ event.Veto(); } -bool wxListCtrlEx::OnBeginRename(const wxListEvent& event) +bool wxListCtrlEx::OnBeginRename(const wxListEvent&) { return false; } -bool wxListCtrlEx::OnAcceptRename(const wxListEvent& event) +bool wxListCtrlEx::OnAcceptRename(const wxListEvent&) { return false; } @@ -1124,21 +1115,25 @@ break; case HDN_ITEMCHANGINGA: case HDN_ITEMCHANGINGW: - if (m_columnDragging) - { - if (nmHDR->pitem->mask & HDI_WIDTH && nmHDR->pitem->cxy < MIN_COLUMN_WIDTH) - { + if (m_columnDragging) { + if (nmHDR->pitem->mask & HDI_WIDTH && nmHDR->pitem->cxy < MIN_COLUMN_WIDTH) { *result = 1; return true; } - else - { + else { *result = 0; return false; } } else return false; + case HDN_DIVIDERDBLCLICK: + { + wxListEvent event(wxEVT_LIST_COL_END_DRAG, GetId()); + event.SetEventObject(this); + AddPendingEvent(event); + } + break; } return wxListCtrl::MSWOnNotify(idCtrl, lParam, result); diff -Nru filezilla-3.14.1/src/interface/listctrlex.h filezilla-3.15.0.2/src/interface/listctrlex.h --- filezilla-3.14.1/src/interface/listctrlex.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/listctrlex.h 2016-02-05 08:54:46.000000000 +0000 @@ -129,7 +129,7 @@ void OnColumnDragging(wxListEvent& event); bool m_prefixSearch_enabled{}; - CDateTime m_prefixSearch_lastKeyPress; + fz::datetime m_prefixSearch_lastKeyPress; wxString m_prefixSearch_prefix; bool ReadColumnWidths(unsigned int optionId); diff -Nru filezilla-3.14.1/src/interface/listingcomparison.cpp filezilla-3.15.0.2/src/interface/listingcomparison.cpp --- filezilla-3.14.1/src/interface/listingcomparison.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/listingcomparison.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -84,7 +84,7 @@ } const int mode = COptions::Get()->GetOptionVal(OPTION_COMPARISONMODE); - duration const threshold = duration::from_minutes( COptions::Get()->GetOptionVal(OPTION_COMPARISON_THRESHOLD) ); + fz::duration const threshold = fz::duration::from_minutes( COptions::Get()->GetOptionVal(OPTION_COMPARISON_THRESHOLD) ); m_pLeft->StartComparison(); m_pRight->StartComparison(); @@ -93,14 +93,14 @@ bool localDir = false; bool remoteDir = false; int64_t localSize, remoteSize; - CDateTime localDate, remoteDate; + fz::datetime localDate, remoteDate; const int dirSortMode = COptions::Get()->GetOptionVal(OPTION_FILELIST_DIRSORT); const bool hide_identical = COptions::Get()->GetOptionVal(OPTION_COMPARE_HIDEIDENTICAL) != 0; - bool gotLocal = m_pLeft->GetNextFile(localFile, localDir, localSize, localDate); - bool gotRemote = m_pRight->GetNextFile(remoteFile, remoteDir, remoteSize, remoteDate); + bool gotLocal = m_pLeft->get_next_file(localFile, localDir, localSize, localDate); + bool gotRemote = m_pRight->get_next_file(remoteFile, remoteDir, remoteSize, remoteDate); while (gotLocal && gotRemote) { int cmp = CompareFiles(dirSortMode, localFile, remoteFile, localDir, remoteDir); @@ -114,8 +114,8 @@ } } else { - if (!localDate.IsValid() || !remoteDate.IsValid()) { - if (!hide_identical || localDate.IsValid() || remoteDate.IsValid() || 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); @@ -124,14 +124,14 @@ else { CComparableListing::t_fileEntryFlags localFlag, remoteFlag; - int dateCmp = localDate.Compare(remoteDate); + int dateCmp = localDate.compare(remoteDate); if (dateCmp < 0) { localDate += threshold; } else if (dateCmp > 0 ) { remoteDate += threshold; } - int adjustedDateCmp = localDate.Compare(remoteDate); + int adjustedDateCmp = localDate.compare(remoteDate); if (dateCmp && dateCmp == -adjustedDateCmp) { dateCmp = 0; } @@ -150,32 +150,32 @@ } } } - gotLocal = m_pLeft->GetNextFile(localFile, localDir, localSize, localDate); - gotRemote = m_pRight->GetNextFile(remoteFile, remoteDir, remoteSize, remoteDate); + gotLocal = m_pLeft->get_next_file(localFile, localDir, localSize, localDate); + gotRemote = m_pRight->get_next_file(remoteFile, remoteDir, remoteSize, remoteDate); continue; } if (cmp < 0) { m_pLeft->CompareAddFile(CComparableListing::lonely); m_pRight->CompareAddFile(CComparableListing::fill); - gotLocal = m_pLeft->GetNextFile(localFile, localDir, localSize, localDate); + gotLocal = m_pLeft->get_next_file(localFile, localDir, localSize, localDate); } else { m_pLeft->CompareAddFile(CComparableListing::fill); m_pRight->CompareAddFile(CComparableListing::lonely); - gotRemote = m_pRight->GetNextFile(remoteFile, remoteDir, remoteSize, remoteDate); + gotRemote = m_pRight->get_next_file(remoteFile, remoteDir, remoteSize, remoteDate); } } while (gotLocal) { m_pLeft->CompareAddFile(CComparableListing::lonely); m_pRight->CompareAddFile(CComparableListing::fill); - gotLocal = m_pLeft->GetNextFile(localFile, localDir, localSize, localDate); + gotLocal = m_pLeft->get_next_file(localFile, localDir, localSize, localDate); } while (gotRemote) { m_pLeft->CompareAddFile(CComparableListing::fill); m_pRight->CompareAddFile(CComparableListing::lonely); - gotRemote = m_pRight->GetNextFile(remoteFile, remoteDir, remoteSize, remoteDate); + gotRemote = m_pRight->get_next_file(remoteFile, remoteDir, remoteSize, remoteDate); } m_pRight->FinishComparison(); diff -Nru filezilla-3.14.1/src/interface/listingcomparison.h filezilla-3.15.0.2/src/interface/listingcomparison.h --- filezilla-3.14.1/src/interface/listingcomparison.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/listingcomparison.h 2016-02-05 08:54:46.000000000 +0000 @@ -20,7 +20,7 @@ virtual bool CanStartComparison() = 0; virtual void StartComparison() = 0; - virtual bool GetNextFile(wxString& name, bool &dir, int64_t &size, CDateTime& date) = 0; + virtual bool get_next_file(wxString& name, bool &dir, int64_t &size, fz::datetime& date) = 0; virtual void CompareAddFile(t_fileEntryFlags flags) = 0; virtual void FinishComparison() = 0; virtual void ScrollTopItem(int item) = 0; diff -Nru filezilla-3.14.1/src/interface/LocalListView.cpp filezilla-3.15.0.2/src/interface/LocalListView.cpp --- filezilla-3.14.1/src/interface/LocalListView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/LocalListView.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -19,11 +19,13 @@ #include "edithandler.h" #include "dragdropmanager.h" #include "drop_target_ex.h" -#include "local_filesys.h" #include "filelist_statusbar.h" #include "sizeformatting.h" #include "timeformatting.h" +#include +#include + class CLocalListViewDropTarget : public CScrollableDropTarget { public: @@ -304,6 +306,7 @@ bool CLocalListView::DisplayDir(CLocalPath const& dirname) { + CancelLabelEdit(); wxString focused; @@ -371,9 +374,9 @@ regular_dir: #endif CFilterManager filter; - CLocalFileSystem local_filesystem; + fz::local_filesys local_filesys; - if (!local_filesystem.BeginFindFiles(m_dir.GetPath(), false)) { + if (!local_filesys.begin_find_files(fz::to_native(m_dir.GetPath()), false)) { SetItemCount(1); return false; } @@ -387,12 +390,14 @@ int num = m_fileData.size(); CLocalFileData data; bool wasLink; - while (local_filesystem.GetNextFile(data.name, wasLink, data.dir, &data.size, &data.time, &data.attributes)) { - if (data.name.empty()) { + fz::native_string name; + while (local_filesys.get_next_file(name, wasLink, data.dir, &data.size, &data.time, &data.attributes)) { + if (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) @@ -927,7 +932,7 @@ void CLocalListView::OnMenuDelete(wxCommandEvent&) { - std::list pathsToDelete; + std::list pathsToDelete; long item = -1; while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1) { if (!item && m_hasParent) @@ -940,10 +945,10 @@ if (data->comparison_flags == fill) continue; - pathsToDelete.push_back(m_dir.GetPath() + data->name); + pathsToDelete.push_back(fz::to_native(m_dir.GetPath() + data->name)); } - if (!CLocalFileSystem::RecursiveDelete(pathsToDelete, this)) - wxGetApp().DisplayEncodingWarning(); + gui_recursive_remove rmd(this); + rmd.remove(pathsToDelete); m_pState->SetLocalDir(m_dir); } @@ -1315,12 +1320,12 @@ CLocalFileData data; bool wasLink; - enum CLocalFileSystem::local_fileType type = CLocalFileSystem::GetFileInfo(m_dir.GetPath() + file, wasLink, &data.size, &data.time, &data.attributes); - if (type == CLocalFileSystem::unknown) + 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) return; data.name = file; - data.dir = type == CLocalFileSystem::dir; + 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)) @@ -1496,7 +1501,7 @@ } } -bool CLocalListView::GetNextFile(wxString& name, bool& dir, int64_t& size, CDateTime& date) +bool CLocalListView::get_next_file(wxString& name, bool& dir, int64_t& size, fz::datetime& date) { if (++m_comparisonIndex >= (int)m_originalIndexMapping.size()) return false; diff -Nru filezilla-3.14.1/src/interface/LocalListView.h filezilla-3.15.0.2/src/interface/LocalListView.h --- filezilla-3.14.1/src/interface/LocalListView.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/LocalListView.h 2016-02-05 08:54:46.000000000 +0000 @@ -17,7 +17,7 @@ #ifdef __WXMSW__ CSparseOptional label; #endif - CDateTime time; + fz::datetime time; int64_t size; int attributes; bool dir; @@ -61,7 +61,7 @@ public: virtual bool CanStartComparison(); virtual void StartComparison(); - virtual bool GetNextFile(wxString& name, bool &dir, int64_t &size, CDateTime& date); + virtual bool get_next_file(wxString& name, bool &dir, int64_t &size, fz::datetime& date); virtual void FinishComparison(); virtual bool ItemIsDir(int index) const; diff -Nru filezilla-3.14.1/src/interface/LocalTreeView.cpp filezilla-3.15.0.2/src/interface/LocalTreeView.cpp --- filezilla-3.14.1/src/interface/LocalTreeView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/LocalTreeView.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -7,11 +7,12 @@ #include #include "dndobjects.h" #include "inputdialog.h" -#include "local_filesys.h" #include "dragdropmanager.h" #include "drop_target_ex.h" #include "Options.h" +#include + #ifdef __WXMSW__ #include #include @@ -427,14 +428,12 @@ void CLocalTreeView::DisplayDir(wxTreeItemId parent, const wxString& dirname, const wxString& knownSubdir /*=_T("")*/) { - CLocalFileSystem local_filesystem; + fz::local_filesys local_filesys; { wxLogNull log; - if (!local_filesystem.BeginFindFiles(dirname, true)) - { - if (!knownSubdir.empty()) - { + if (!local_filesys.begin_find_files(fz::to_native(dirname), true)) { + if (!knownSubdir.empty()) { wxTreeItemId item = GetSubdir(parent, knownSubdir); if (item != wxTreeItemId()) return; @@ -468,33 +467,34 @@ bool matchedKnown = false; - wxString file; + fz::native_string file; bool wasLink; int attributes; bool is_dir; static int64_t const size(-1); - CDateTime date; - while (local_filesystem.GetNextFile(file, wasLink, is_dir, 0, &date, &attributes)) { + fz::datetime date; + while (local_filesys.get_next_file(file, wasLink, is_dir, 0, &date, &attributes)) { wxASSERT(is_dir); if (file.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } + wxString file_wx = file; - wxString fullName = dirname + file; + wxString fullName = dirname + file_wx; #ifdef __WXMSW__ - if (file.CmpNoCase(knownSubdir)) + if (file_wx.CmpNoCase(knownSubdir)) #else - if (file != knownSubdir) + if (file_wx != knownSubdir) #endif { - if (filter.FilenameFiltered(file, dirname, true, size, true, attributes, date)) + if (filter.FilenameFiltered(file_wx, dirname, true, size, true, attributes, date)) continue; } else matchedKnown = true; - wxTreeItemId item = AppendItem(parent, file, GetIconIndex(iconType::dir, fullName), + wxTreeItemId item = AppendItem(parent, file_wx, GetIconIndex(iconType::dir, fullName), #ifdef __WXMSW__ -1 #else @@ -527,29 +527,28 @@ CFilterManager filter; - CLocalFileSystem local_filesystem; - if (!local_filesystem.BeginFindFiles(dirname, true)) + fz::local_filesys local_filesys; + if (!local_filesys.begin_find_files(fz::to_native(dirname), true)) return wxString(); - wxString file; + fz::native_string file; bool wasLink; int attributes; bool is_dir; static int64_t const size(-1); - CDateTime date; - while (local_filesystem.GetNextFile(file, wasLink, is_dir, 0, &date, &attributes)) - { + fz::datetime date; + while (local_filesys.get_next_file(file, wasLink, is_dir, 0, &date, &attributes)) { wxASSERT(is_dir); - if (file.empty()) - { + if (file.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - if (filter.FilenameFiltered(file, dirname, true, size, true, attributes, date)) + wxString file_wx = file; + if (filter.FilenameFiltered(file_wx, dirname, true, size, true, attributes, date)) continue; - return file; + return file_wx; } return wxString(); @@ -559,17 +558,14 @@ { const wxString& separator = wxFileName::GetPathSeparator(); - while (!subDir.empty()) - { + while (!subDir.empty()) { int pos = subDir.Find(separator); wxString segment; - if (pos == -1) - { + if (pos == -1) { segment = subDir; subDir = _T(""); } - else - { + else { segment = subDir.Left(pos); subDir = subDir.Mid(pos + 1); } @@ -715,8 +711,8 @@ dirsToCheck.pop_front(); // Step 1: Check if directory exists - CLocalFileSystem local_filesystem; - if (!local_filesystem.BeginFindFiles(dir.dir, true)) { + fz::local_filesys local_filesys; + if (!local_filesys.begin_find_files(fz::to_native(dir.dir), true)) { // Dir does exist (listed in parent) but may not be accessible. // Recurse into children anyhow, they might be accessible again. wxTreeItemIdValue value; @@ -732,22 +728,23 @@ // Step 2: Enumerate subdirectories on disk and sort them std::vector dirs; - wxString file; + fz::native_string file; static int64_t const size(-1); bool was_link; bool is_dir; int attributes; - CDateTime date; - while (local_filesystem.GetNextFile(file, was_link, is_dir, 0, &date, &attributes)) { + fz::datetime date; + while (local_filesys.get_next_file(file, was_link, is_dir, 0, &date, &attributes)) { if (file.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - if (filter.FilenameFiltered(file, dir.dir, true, size, true, attributes, date)) + wxString file_wx = file; + if (filter.FilenameFiltered(file_wx, dir.dir, true, size, true, attributes, date)) continue; - dirs.push_back(file); + dirs.push_back(file_wx); } auto const& sortFunc = CFileListCtrlSortBase::GetCmpFunction(m_nameSortMode); std::sort(dirs.begin(), dirs.end(), [&](auto const& lhs, auto const& rhs) { return sortFunc(lhs, rhs) < 0; }); @@ -1183,8 +1180,8 @@ if (!local_path.HasParent() || !local_path.IsWriteable()) return; - if (!CLocalFileSystem::RecursiveDelete(path, this)) - wxGetApp().DisplayEncodingWarning(); + gui_recursive_remove rmd(this); + rmd.remove(fz::to_native(path)); wxTreeItemId item = GetSelection(); while (item && item != m_contextMenuItem) @@ -1347,7 +1344,7 @@ CFilterManager filter; const int attributes = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; - if (!filter.FilenameFiltered(_T("localhost"), path, true, size, true, attributes, CDateTime())) + if (!filter.FilenameFiltered(_T("localhost"), path, true, size, true, attributes, fz::datetime())) { if (!child) AppendItem(item, _T("")); @@ -1364,13 +1361,13 @@ if (pData) { bool wasLink; int attributes; - enum CLocalFileSystem::local_fileType type; - CDateTime date; - if (!path.empty() && path.Last() == CLocalFileSystem::path_separator) - type = CLocalFileSystem::GetFileInfo(path + pData->m_known_subdir, wasLink, 0, &date, &attributes); + enum fz::local_filesys::type type; + fz::datetime date; + 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 - type = CLocalFileSystem::GetFileInfo(path + CLocalFileSystem::path_separator + pData->m_known_subdir, wasLink, 0, &date, &attributes); - if (type == CLocalFileSystem::dir) { + 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)) return true; @@ -1433,14 +1430,14 @@ drive += _T(":"); long drivesToHide = CVolumeDescriptionEnumeratorThread::GetDrivesToHide(); - if( CVolumeDescriptionEnumeratorThread::IsHidden(drive, drivesToHide) ) { + if( CVolumeDescriptionEnumeratorThread::IsHidden(drive.wc_str(), drivesToHide) ) { return wxTreeItemId(); } // Get the label of the drive wxChar volumeName[501]; int oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); - BOOL res = GetVolumeInformation(drive + _T("\\"), volumeName, 500, 0, 0, 0, 0, 0); + BOOL res = GetVolumeInformation((drive + _T("\\")).wc_str(), volumeName, 500, 0, 0, 0, 0, 0); SetErrorMode(oldErrorMode); wxString itemLabel = drive; diff -Nru filezilla-3.14.1/src/interface/Mainfrm.cpp filezilla-3.15.0.2/src/interface/Mainfrm.cpp --- filezilla-3.14.1/src/interface/Mainfrm.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/Mainfrm.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -79,32 +79,33 @@ std::map, wxChar>> keyboardCommands; +#ifdef __WXMAC__ wxTextEntry* GetSpecialTextEntry(wxWindow* w, wxChar cmd) { -#ifdef __WXMAC__ - if( cmd == 'A' || cmd == 'V' ) { + if (cmd == 'A' || cmd == 'V') { wxTextCtrl* text = dynamic_cast(w); - if( text && text->GetWindowStyle() & wxTE_PASSWORD ) { + if (text && text->GetWindowStyle() & wxTE_PASSWORD) { return text; } } - wxComboBox* combo = dynamic_cast(w); - if( combo ) { - return combo; - } -#endif + return dynamic_cast(w); +} +#else +wxTextEntry* GetSpecialTextEntry(wxWindow*, wxChar) +{ return 0; } +#endif bool HandleKeyboardCommand(wxCommandEvent& event, wxWindow& parent) { auto const& it = keyboardCommands.find(event.GetId()); - if( it == keyboardCommands.end() ) { + if (it == keyboardCommands.end()) { return false; } wxTextEntry* e = GetSpecialTextEntry(parent.FindFocus(), it->second.second); - if( e ) { + if (e) { it->second.first(e); } else { @@ -1397,6 +1398,7 @@ return; } #endif + (void)e; OpenSiteManager(); } @@ -1537,7 +1539,7 @@ COptions::Get()->SetOption(local ? OPTION_SHOW_TREE_LOCAL : OPTION_SHOW_TREE_REMOTE, show); } -void CMainFrame::OnToggleQueueView(wxCommandEvent& event) +void CMainFrame::OnToggleQueueView(wxCommandEvent&) { if (!m_pBottomSplitter) return; @@ -1614,19 +1616,19 @@ } #if FZ_MANUALUPDATECHECK -void CMainFrame::OnCheckForUpdates(wxCommandEvent& event) +void CMainFrame::OnCheckForUpdates(wxCommandEvent&) { - if( !m_pUpdater ) { + if (!m_pUpdater) { return; } update_dialog_timer_.Stop(); - CUpdateDialog dlg( this, *m_pUpdater ); + CUpdateDialog dlg(this, *m_pUpdater); dlg.ShowModal(); update_dialog_timer_.Stop(); } -void CMainFrame::UpdaterStateChanged( UpdaterState s, build const& v ) +void CMainFrame::UpdaterStateChanged(UpdaterState s, build const& v) { #if FZ_AUTOUPDATECHECK if( !m_pMenuBar ) { @@ -2140,7 +2142,7 @@ m_pAsyncRequestQueue->TriggerProcessing(); } -void CMainFrame::OnToolbarComparison(wxCommandEvent& event) +void CMainFrame::OnToolbarComparison(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); if (!pState) @@ -2249,7 +2251,7 @@ pComparisonManager->CompareListings(); } -void CMainFrame::OnDropdownComparisonHide(wxCommandEvent& event) +void CMainFrame::OnDropdownComparisonHide(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); if (!pState) @@ -2341,7 +2343,7 @@ } } -void CMainFrame::OnFilterRightclicked(wxCommandEvent& event) +void CMainFrame::OnFilterRightclicked(wxCommandEvent&) { const bool active = CFilterManager::HasActiveFilters(); @@ -2399,7 +2401,7 @@ } #endif -void CMainFrame::OnSyncBrowse(wxCommandEvent& event) +void CMainFrame::OnSyncBrowse(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); if (!pState) @@ -2473,7 +2475,7 @@ } #ifdef __WXGTK__ -void CMainFrame::OnTaskBarClick_Delayed(wxCommandEvent& event) +void CMainFrame::OnTaskBarClick_Delayed(wxCommandEvent&) { m_taskbar_is_uniconizing = false; } @@ -2481,7 +2483,7 @@ #endif -void CMainFrame::OnSearch(wxCommandEvent& event) +void CMainFrame::OnSearch(wxCommandEvent&) { CState* pState = CContextManager::Get()->GetCurrentContext(); if (!pState) @@ -2522,7 +2524,7 @@ } } -void CMainFrame::OnMenuNewTab(wxCommandEvent& event) +void CMainFrame::OnMenuNewTab(wxCommandEvent&) { if (m_pContextControl) m_pContextControl->CreateTab(); diff -Nru filezilla-3.14.1/src/interface/Makefile.am filezilla-3.15.0.2/src/interface/Makefile.am --- filezilla-3.14.1/src/interface/Makefile.am 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/Makefile.am 2016-02-10 19:27:09.000000000 +0000 @@ -246,11 +246,12 @@ filezilla_DEPENDENCIES = ../engine/libengine.a filezilla_CPPFLAGS = -I$(srcdir)/../include +filezilla_CPPFLAGS += $(LIBFILEZILLA_CFLAGS) filezilla_CPPFLAGS += $(WX_CPPFLAGS) filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) -filezilla_LDFLAGS = ../engine/libengine.a +filezilla_LDFLAGS = ../engine/libengine.a $(LIBFILEZILLA_LIBS) filezilla_LDFLAGS += $(PUGIXML_LIBS) filezilla_LDFLAGS += $(LIBGNUTLS_LIBS) @@ -267,7 +268,7 @@ filezilla_LDFLAGS += $(LIBSQLITE3_LIBS) if MINGW -filezilla_LDFLAGS += -lnormaliz -lole32 -luuid -lnetapi32 -lmpr -lpowrprof +filezilla_LDFLAGS += -lnormaliz -lole32 -luuid -lnetapi32 -lmpr -lpowrprof -lws2_32 endif # GTK+ libs, empty if not using wxGTK @@ -295,7 +296,7 @@ mkdir -p $(top_builddir)/FileZilla.app/Contents/Resources $(MAKE) -C resources mac-copy-resources cp -f filezilla $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla - cp -f $(top_srcdir)/COPYING $(top_builddir)/FileZilla.app/Contents/COPYING + cp -f $(top_srcdir)/COPYING $(top_builddir)/FileZilla.app/Contents/SharedSupport/COPYING mkdir -p $(top_builddir)/FileZilla.app/Contents/docs cp -f $(top_srcdir)/docs/fzdefaults.xml.example $(top_builddir)/FileZilla.app/Contents/docs/fzdefaults.xml.example cp -f $(top_srcdir)/docs/*.man $(top_builddir)/FileZilla.app/Contents/docs diff -Nru filezilla-3.14.1/src/interface/Makefile.in filezilla-3.15.0.2/src/interface/Makefile.in --- filezilla-3.14.1/src/interface/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -84,7 +84,7 @@ @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 +@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) subdir = src/interface @@ -423,6 +423,8 @@ 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@ @@ -720,13 +722,14 @@ $(am__append_5) $(am__append_6) # GTK+ libs, empty if not using wxGTK -filezilla_CPPFLAGS = -I$(srcdir)/../include $(WX_CPPFLAGS) \ - $(LIBSQLITE3_CFLAGS) $(LIBGTK_CFLAGS) +filezilla_CPPFLAGS = -I$(srcdir)/../include $(LIBFILEZILLA_CFLAGS) \ + $(WX_CPPFLAGS) $(LIBSQLITE3_CFLAGS) $(LIBGTK_CFLAGS) filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY) filezilla_CFLAGS = $(WX_CFLAGS_ONLY) -filezilla_LDFLAGS = ../engine/libengine.a $(PUGIXML_LIBS) \ - $(LIBGNUTLS_LIBS) $(am__append_3) $(WX_LIBS) $(RESOURCEFILE) \ - $(IDN_LIB) $(LIBSQLITE3_LIBS) $(am__append_4) $(LIBGTK_LIBS) +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) dist_noinst_DATA = interface.vcxproj @MACAPPBUNDLE_TRUE@noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT) CLEANFILES = filezilla.h.gch @@ -2868,7 +2871,7 @@ mkdir -p $(top_builddir)/FileZilla.app/Contents/Resources $(MAKE) -C resources mac-copy-resources cp -f filezilla $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla - cp -f $(top_srcdir)/COPYING $(top_builddir)/FileZilla.app/Contents/COPYING + cp -f $(top_srcdir)/COPYING $(top_builddir)/FileZilla.app/Contents/SharedSupport/COPYING mkdir -p $(top_builddir)/FileZilla.app/Contents/docs cp -f $(top_srcdir)/docs/fzdefaults.xml.example $(top_builddir)/FileZilla.app/Contents/docs/fzdefaults.xml.example cp -f $(top_srcdir)/docs/*.man $(top_builddir)/FileZilla.app/Contents/docs diff -Nru filezilla-3.14.1/src/interface/manual_transfer.cpp filezilla-3.15.0.2/src/interface/manual_transfer.cpp --- filezilla-3.14.1/src/interface/manual_transfer.cpp 2015-07-28 15:09:33.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/manual_transfer.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,6 +1,5 @@ #include #include "manual_transfer.h" -#include "local_filesys.h" #include "auto_ascii_files.h" #include "state.h" #include "Options.h" @@ -9,6 +8,8 @@ #include "QueueView.h" #include "xrc_helper.h" +#include + BEGIN_EVENT_TABLE(CManualTransfer, wxDialogEx) EVT_TEXT(XRCID("ID_LOCALFILE"), CManualTransfer::OnLocalChanged) EVT_TEXT(XRCID("ID_REMOTEFILE"), CManualTransfer::OnRemoteChanged) @@ -211,24 +212,24 @@ } } -void CManualTransfer::OnLocalChanged(wxCommandEvent& event) +void CManualTransfer::OnLocalChanged(wxCommandEvent&) { if (XRCCTRL(*this, "ID_DOWNLOAD", wxRadioButton)->GetValue()) return; wxString file = XRCCTRL(*this, "ID_LOCALFILE", wxTextCtrl)->GetValue(); - m_local_file_exists = CLocalFileSystem::GetFileType(file) == CLocalFileSystem::file; + m_local_file_exists = fz::local_filesys::get_file_type(fz::to_native(file)) == fz::local_filesys::file; SetAutoAsciiState(); } -void CManualTransfer::OnRemoteChanged(wxCommandEvent& event) +void CManualTransfer::OnRemoteChanged(wxCommandEvent&) { SetAutoAsciiState(); } -void CManualTransfer::OnLocalBrowse(wxCommandEvent& event) +void CManualTransfer::OnLocalBrowse(wxCommandEvent&) { int flags; wxString title; @@ -283,7 +284,7 @@ SetServerState(); } -void CManualTransfer::OnOK(wxCommandEvent& event) +void CManualTransfer::OnOK(wxCommandEvent&) { if (!UpdateServer()) return; @@ -303,12 +304,12 @@ return; } - CLocalFileSystem::local_fileType type = CLocalFileSystem::GetFileType(local_file); - if (type == CLocalFileSystem::dir) { + fz::local_filesys::type type = fz::local_filesys::get_file_type(fz::to_native(local_file)); + if (type == fz::local_filesys::dir) { wxMessageBoxEx(_("Local file is a directory instead of a regular file."), _("Manual transfer"), wxICON_EXCLAMATION); return; } - if (!download && type != CLocalFileSystem::file && start) { + if (!download && type != fz::local_filesys::file && start) { wxMessageBoxEx(_("Local file does not exist."), _("Manual transfer"), wxICON_EXCLAMATION); return; } @@ -509,7 +510,7 @@ return true; } -void CManualTransfer::OnSelectSite(wxCommandEvent& event) +void CManualTransfer::OnSelectSite(wxCommandEvent&) { std::unique_ptr pMenu = CSiteManager::GetSitesMenu(); if (pMenu) { diff -Nru filezilla-3.14.1/src/interface/menu_bar.cpp filezilla-3.15.0.2/src/interface/menu_bar.cpp --- filezilla-3.14.1/src/interface/menu_bar.cpp 2015-07-01 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/menu_bar.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -326,7 +326,7 @@ event.Skip(); } -void CMenuBar::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2) +void CMenuBar::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) { switch (notification) { diff -Nru filezilla-3.14.1/src/interface/netconfwizard.cpp filezilla-3.15.0.2/src/interface/netconfwizard.cpp --- filezilla-3.14.1/src/interface/netconfwizard.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/netconfwizard.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -1,6 +1,8 @@ #include -#include "event_loop.h" +#include +#include +#include #include "engine_context.h" #include "netconfwizard.h" #include "Options.h" @@ -14,7 +16,6 @@ BEGIN_EVENT_TABLE(CNetConfWizard, wxWizard) EVT_WIZARD_PAGE_CHANGING(wxID_ANY, CNetConfWizard::OnPageChanging) EVT_WIZARD_PAGE_CHANGED(wxID_ANY, CNetConfWizard::OnPageChanged) -EVT_SOCKET(wxID_ANY, CNetConfWizard::OnSocketEvent) EVT_BUTTON(XRCID("ID_RESTART"), CNetConfWizard::OnRestart) EVT_WIZARD_FINISHED(wxID_ANY, CNetConfWizard::OnFinish) EVT_TIMER(wxID_ANY, CNetConfWizard::OnTimer) @@ -28,14 +29,11 @@ #endif CNetConfWizard::CNetConfWizard(wxWindow* parent, COptions* pOptions, CFileZillaEngineContext & engine_context) - : CEventHandler(engine_context.GetEventLoop()) + : fz::event_handler(engine_context.GetEventLoop()) , m_parent(parent), m_pOptions(pOptions), m_pSocketServer(0) { - m_socket = 0; m_pIPResolver = 0; m_pSendBuffer = 0; - m_pSocketServer = 0; - m_pDataSocket = 0; m_timer.SetOwner(this); @@ -44,7 +42,7 @@ CNetConfWizard::~CNetConfWizard() { - RemoveHandler(); + remove_handler(); delete m_socket; delete m_pIPResolver; @@ -145,34 +143,28 @@ void CNetConfWizard::OnPageChanging(wxWizardEvent& event) { - if (event.GetPage() == m_pages[3]) - { + if (event.GetPage() == m_pages[3]) { int mode = XRCCTRL(*this, "ID_ACTIVEMODE1", wxRadioButton)->GetValue() ? 0 : (XRCCTRL(*this, "ID_ACTIVEMODE2", wxRadioButton)->GetValue() ? 1 : 2); - if (mode == 1) - { + if (mode == 1) { wxTextCtrl* control = XRCCTRL(*this, "ID_ACTIVEIP", wxTextCtrl); wxString ip = control->GetValue(); - if (ip.empty()) - { + if (ip.empty()) { wxMessageBoxEx(_("Please enter your external IP address")); control->SetFocus(); event.Veto(); return; } - if (!IsIpAddress(ip)) - { - wxMessageBoxEx(_("You have to enter a valid IP address.")); + if (fz::get_address_type(ip.ToStdWstring()) != fz::address_type::ipv4) { + wxMessageBoxEx(_("You have to enter a valid IPv4 address.")); control->SetFocus(); event.Veto(); return; } } - else if (mode == 2) - { + else if (mode == 2) { wxTextCtrl* pResolver = XRCCTRL(*this, "ID_ACTIVERESOLVER", wxTextCtrl); wxString address = pResolver->GetValue(); - if (address.empty()) - { + if (address.empty()) { wxMessageBoxEx(_("Please enter an URL where to get your external address from")); pResolver->SetFocus(); event.Veto(); @@ -180,11 +172,9 @@ } } } - else if (event.GetPage() == m_pages[4]) - { + else if (event.GetPage() == m_pages[4]) { int mode = XRCCTRL(*this, "ID_ACTIVE_PORTMODE1", wxRadioButton)->GetValue() ? 0 : 1; - if (mode) - { + if (mode) { wxTextCtrl* pPortMin = XRCCTRL(*this, "ID_ACTIVE_PORTMIN", wxTextCtrl); wxTextCtrl* pPortMax = XRCCTRL(*this, "ID_ACTIVE_PORTMAX", wxTextCtrl); wxString portMin = pPortMin->GetValue(); @@ -201,13 +191,11 @@ } } } - else if (event.GetPage() == m_pages[5] && !event.GetDirection()) - { + else if (event.GetPage() == m_pages[5] && !event.GetDirection()) { wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); pNext->SetLabel(m_nextLabelText); } - else if (event.GetPage() == m_pages[5] && event.GetDirection()) - { + else if (event.GetPage() == m_pages[5] && event.GetDirection()) { if (m_testDidRun) return; @@ -220,30 +208,25 @@ event.Veto(); PrintMessage(wxString::Format(_("Connecting to %s"), _T("probe.filezilla-project.org")), 0); - m_socket = new wxSocketClient(wxSOCKET_NOWAIT); - m_socket->SetEventHandler(*this, 0); - m_socket->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG | wxSOCKET_CONNECTION_FLAG | wxSOCKET_LOST_FLAG); - m_socket->Notify(true); + m_socket = new CSocket(this); m_recvBufferPos = 0; - wxIPV4address addr; - addr.Hostname(_T("probe.filezilla-project.org")); - addr.Service(21); - - m_socket->Connect(addr, false); + int res = m_socket->Connect(_T("probe.filezilla-project.org"), 21); + if (res && res != EINPROGRESS) { + PrintMessage(wxString::Format(_("Connect failed: %s"), CSocket::GetErrorDescription(res)), 1); + CloseSocket(); + } } } void CNetConfWizard::OnPageChanged(wxWizardEvent& event) { - if (event.GetPage() == m_pages[5]) - { + if (event.GetPage() == m_pages[5]) { wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); m_nextLabelText = pNext->GetLabel(); pNext->SetLabel(_("&Test")); } - else if (event.GetPage() == m_pages[6]) - { + else if (event.GetPage() == m_pages[6]) { wxButton* pPrev = wxDynamicCast(FindWindow(wxID_BACKWARD), wxButton); pPrev->Disable(); wxButton* pNext = wxDynamicCast(FindWindow(wxID_FORWARD), wxButton); @@ -251,52 +234,60 @@ } } -void CNetConfWizard::OnSocketEvent(wxSocketEvent& event) +void CNetConfWizard::DoOnSocketEvent(CSocketEventSource* s, SocketEventType t, int error) { - if (!m_socket) - return; - - if (event.GetSocket() == m_socket) - { - switch (event.GetSocketEvent()) + if (s == m_socket) { + if (error) { + OnClose(); + return; + } + switch (t) { - case wxSOCKET_INPUT: + case SocketEventType::read: OnReceive(); break; - case wxSOCKET_OUTPUT: + case SocketEventType::write: OnSend(); break; - case wxSOCKET_LOST: + case SocketEventType::close: OnClose(); break; - case wxSOCKET_CONNECTION: + case SocketEventType::connection: OnConnect(); break; + default: + break; } } - else if (event.GetSocket() == m_pSocketServer) - { - switch (event.GetSocketEvent()) - { - case wxSOCKET_LOST: + else if (s == m_pSocketServer) { + if (error) { + PrintMessage(_("Listen socket closed"), 1); + CloseSocket(); + return; + } + switch (t) { + case SocketEventType::close: PrintMessage(_("Listen socket closed"), 1); CloseSocket(); break; - case wxSOCKET_CONNECTION: + case SocketEventType::connection: OnAccept(); break; default: break; } } - else if (event.GetSocket() == m_pDataSocket) - { - switch (event.GetSocketEvent()) + else if (s == m_pDataSocket) { + if (error) { + OnDataClose(); + return; + } + switch (t) { - case wxSOCKET_LOST: + case SocketEventType::close: OnDataClose(); break; - case wxSOCKET_INPUT: + case SocketEventType::read: OnDataReceive(); break; default: @@ -305,6 +296,7 @@ } } + void CNetConfWizard::OnSend() { if (!m_pSendBuffer) @@ -313,20 +305,17 @@ if (!m_socket) return; - int len = strlen(m_pSendBuffer); - m_socket->Write(m_pSendBuffer, len); - if (m_socket->Error()) - { - if (m_socket->LastError() != wxSOCKET_WOULDBLOCK) - { + int error; + int const len = strlen(m_pSendBuffer); + int const written = m_socket->Write(m_pSendBuffer, len, error); + if (written < 0) { + if (error != EAGAIN) { PrintMessage(_("Failed to send command."), 1); CloseSocket(); } return; } - int written = m_socket->LastCount(); - if (written == len) - { + if (written == len) { delete [] m_pSendBuffer; m_pSendBuffer = 0; } @@ -341,62 +330,74 @@ void CNetConfWizard::OnConnect() { + PrintMessage(_("Connection established, waiting for welcome message."), 0); m_connectSuccessful = true; } void CNetConfWizard::OnReceive() { - m_socket->Read(m_recvBuffer + m_recvBufferPos, NETCONFBUFFERSIZE - m_recvBufferPos); - unsigned int len; - if (m_socket->Error() || !(len = m_socket->LastCount())) - { - PrintMessage(_("Connection lost"), 1); - CloseSocket(); - return; - } - - m_recvBufferPos += len; - - if (m_recvBufferPos < 3) - return; - - for (int i = 0; i < m_recvBufferPos - 1; i++) - { - if (m_recvBuffer[i] == '\n') - { - m_testResult = servererror; - PrintMessage(_("Invalid data received"), 1); + while (true) { + int 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); + CloseSocket(); + } + return; + } + if (!read) { + PrintMessage(_("Connection lost"), 1); CloseSocket(); return; } - if (m_recvBuffer[i] != '\r') - continue; - if (m_recvBuffer[i + 1] != '\n') - { - m_testResult = servererror; - PrintMessage(_("Invalid data received"), 1); - CloseSocket(); + m_recvBufferPos += read; + + if (m_recvBufferPos < 3) return; + + for (int i = 0; i < m_recvBufferPos - 1; ++i) { + if (m_recvBuffer[i] == '\n') { + m_testResult = servererror; + PrintMessage(_("Invalid data received"), 1); + CloseSocket(); + return; + } + if (m_recvBuffer[i] != '\r') + continue; + + if (m_recvBuffer[i + 1] != '\n') { + m_testResult = servererror; + PrintMessage(_("Invalid data received"), 1); + CloseSocket(); + return; + } + m_recvBuffer[i] = 0; + + if (!*m_recvBuffer) { + m_testResult = servererror; + PrintMessage(_("Invalid data received"), 1); + CloseSocket(); + return; + } + + ParseResponse(m_recvBuffer); + + if (!m_socket) + return; + + memmove(m_recvBuffer, m_recvBuffer + i + 2, m_recvBufferPos - i - 2); + m_recvBufferPos -= i + 2; + i = -1; } - m_recvBuffer[i] = 0; - if (!*m_recvBuffer) - { + if (m_recvBufferPos == 100) { m_testResult = servererror; PrintMessage(_("Invalid data received"), 1); CloseSocket(); return; } - - ParseResponse(m_recvBuffer); - - if (!m_socket) - return; - - memmove(m_recvBuffer, m_recvBuffer + i + 2, m_recvBufferPos - i - 2); - m_recvBufferPos -= i + 2; - i = -1; } } @@ -412,15 +413,13 @@ str += msg; PrintMessage(str, 3); - if (len < 3) - { + if (len < 3) { m_testResult = servererror; PrintMessage(_("Server sent unexpected reply."), 1); CloseSocket(); return; } - if (line[3] && line[3] != ' ') - { + if (line[3] && line[3] != ' ') { m_testResult = servererror; PrintMessage(_("Server sent unexpected reply."), 1); CloseSocket(); @@ -436,30 +435,26 @@ if (line[0] == '2') break; - if (line[1] == '0' && line[2] == '1') - { + if (line[1] == '0' && line[2] == '1') { PrintMessage(_("Communication tainted by router or firewall"), 1); m_testResult = tainted; CloseSocket(); return; } - else if (line[1] == '1' && line[2] == '0') - { + else if (line[1] == '1' && line[2] == '0') { PrintMessage(_("Wrong external IP address"), 1); m_testResult = mismatch; CloseSocket(); return; } - else if (line[1] == '1' && line[2] == '1') - { + else if (line[1] == '1' && line[2] == '1') { PrintMessage(_("Wrong external IP address"), 1); PrintMessage(_("Communication tainted by router or firewall"), 1); m_testResult = mismatchandtainted; CloseSocket(); return; } - else - { + else { m_testResult = servererror; PrintMessage(_("Server sent unexpected reply."), 1); CloseSocket(); @@ -497,8 +492,7 @@ break; - if (line[0] == '5' && line[1] == '0' && (line[2] == '1' || line[2] == '2')) - { + if (line[0] == '5' && line[1] == '0' && (line[2] == '1' || line[2] == '2')) { m_testResult = tainted; PrintMessage(_("PORT command tainted by router or firewall."), 1); CloseSocket(); @@ -545,7 +539,7 @@ SendNextCommand(); } -void CNetConfWizard::PrintMessage(const wxString& msg, int type) +void CNetConfWizard::PrintMessage(const wxString& msg, int) { XRCCTRL(*this, "ID_RESULTS", wxTextCtrl)->AppendText(msg + _T("\n")); } @@ -698,11 +692,8 @@ int mode = XRCCTRL(*this, "ID_ACTIVEMODE1", wxRadioButton)->GetValue() ? 0 : (XRCCTRL(*this, "ID_ACTIVEMODE2", wxRadioButton)->GetValue() ? 1 : 2); if (!mode) { - wxIPV4address addr; - if (m_socket->GetLocal(addr)) { - ret = addr.IPAddress(); - } - else { + ret = m_socket->GetLocalIP(); + if (ret.empty()) { PrintMessage(_("Failed to retrieve local ip address. Aborting"), 1); CloseSocket(); } @@ -771,8 +762,7 @@ wxString ip = GetExternalIPAddress(); if (ip.empty()) return; - if (!GetIPV6LongForm(ip).empty()) - { + 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(); return; @@ -827,7 +817,7 @@ } } -void CNetConfWizard::OnRestart(wxCommandEvent& event) +void CNetConfWizard::OnRestart(wxCommandEvent&) { ResetTest(); ShowPage(m_pages[0], false); @@ -850,10 +840,9 @@ XRCCTRL(*this, "ID_RESULTS", wxTextCtrl)->SetLabel(_T("")); } -void CNetConfWizard::OnFinish(wxWizardEvent& event) +void CNetConfWizard::OnFinish(wxWizardEvent&) { - if (m_testResult != successful) - { + if (m_testResult != successful) { if (wxMessageBoxEx(_("The test did not succeed. Do you really want to save the settings?"), _("Save settings?"), wxYES_NO | wxICON_QUESTION) != wxYES) return; } @@ -895,7 +884,7 @@ XRCCTRL(*this, "ID_ACTIVE_PORTMIN", wxTextCtrl)->GetValue().ToLong(&low); XRCCTRL(*this, "ID_ACTIVE_PORTMAX", wxTextCtrl)->GetValue().ToLong(&high); - int mid = GetRandomNumber(low, high); + int mid = fz::random_number(low, high); wxASSERT(mid >= low && mid <= high); for (int port = mid; port <= high; port++) @@ -911,64 +900,59 @@ int CNetConfWizard::CreateListenSocket(unsigned int port) { - wxIPV4address addr; - if (!addr.AnyAddress()) - return 0; + m_pSocketServer = new CSocket(this); + int res = m_pSocketServer->Listen(CSocket::unspec, port); - if (!addr.Service(port)) - return 0; - - m_pSocketServer = new wxSocketServer(addr, wxSOCKET_NOWAIT); - if (!m_pSocketServer->Ok()) - { + if (res < 0) { delete m_pSocketServer; m_pSocketServer = 0; return 0; } - m_pSocketServer->SetEventHandler(*this); - m_pSocketServer->SetFlags(wxSOCKET_NOWAIT); - m_pSocketServer->SetNotify(wxSOCKET_CONNECTION_FLAG | wxSOCKET_LOST_FLAG); - m_pSocketServer->Notify(true); - - if (port) return port; // Get port number from socket - if (!m_pSocketServer->GetLocal(addr)) - { + int error; + res = m_pSocketServer->GetLocalPort(error); + if (res <= 0) { delete m_pSocketServer; m_pSocketServer = 0; return 0; } - return addr.Service(); + return static_cast(port); } void CNetConfWizard::OnAccept() { + if (!m_socket || !m_pSocketServer) { + return; + } if (m_pDataSocket) return; - m_pDataSocket = m_pSocketServer->Accept(false); + + int error; + m_pDataSocket = m_pSocketServer->Accept(error); if (!m_pDataSocket) return; - wxIPV4address peerAddr, dataPeerAddr; - if (!m_socket->GetPeer(peerAddr)) { + wxString peerAddr = m_socket->GetPeerHost(); + wxString dataPeerAddr = m_pDataSocket->GetPeerHost(); + if (peerAddr.empty()) { delete m_pDataSocket; m_pDataSocket = 0; PrintMessage(_("Failed to get peer address of control connection, connection closed."), 1); CloseSocket(); return; } - if (!m_pDataSocket->GetPeer(dataPeerAddr)) { + if (dataPeerAddr.empty()) { delete m_pDataSocket; m_pDataSocket = 0; PrintMessage(_("Failed to get peer address of data connection, connection closed."), 1); CloseSocket(); return; } - if (peerAddr.IPAddress() != dataPeerAddr.IPAddress()) { + if (peerAddr != dataPeerAddr) { delete m_pDataSocket; m_pDataSocket = 0; PrintMessage(_("Warning, ignoring data connection from wrong IP."), 0); @@ -976,32 +960,31 @@ } delete m_pSocketServer; m_pSocketServer = 0; - - m_pDataSocket->SetEventHandler(*this); - m_pDataSocket->SetFlags(wxSOCKET_NOWAIT); - m_pDataSocket->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - m_pDataSocket->Notify(true); } void CNetConfWizard::OnDataReceive() { char buffer[100]; - m_pDataSocket->Read(buffer, 99); - unsigned int len; - if (m_pDataSocket->Error() || !(len = m_pDataSocket->LastCount())) - { + int error; + int const read = m_pDataSocket->Read(buffer, 99, error); + if (!read) { PrintMessage(_("Data socket closed too early."), 1); CloseSocket(); return; } - buffer[len] = 0; + if (read < 0) { + if (error != EAGAIN) { + PrintMessage(_("Could not read from data socket."), 1); + CloseSocket(); + } + return; + } + buffer[read] = 0; int data = 0; const char* p = buffer; - while (*p && *p != ' ') - { - if (*p < '0' || *p > '9') - { + while (*p && *p != ' ') { + if (*p < '0' || *p > '9') { m_testResult = datatainted; PrintMessage(_("Received data tainted"), 1); CloseSocket(); @@ -1009,24 +992,21 @@ } data = data * 10 + *p++ - '0'; } - if (data != m_data) - { + if (data != m_data) { m_testResult = datatainted; PrintMessage(_("Received data tainted"), 1); CloseSocket(); return; } p++; - if (p - buffer != (int)len - 4) - { + if (p - buffer != read - 4) { PrintMessage(_("Failed to receive data"), 1); CloseSocket(); return; } wxUint32 ip = 0; - for (const wxChar* q = m_externalIP.c_str(); *q; q++) - { + for (const wxChar* q = m_externalIP.c_str(); *q; ++q) { if (*q == '.') ip *= 256; else @@ -1052,8 +1032,7 @@ void CNetConfWizard::OnDataClose() { OnDataReceive(); - if (m_pDataSocket) - { + if (m_pDataSocket) { PrintMessage(_("Data socket closed too early."), 0); CloseSocket(); return; @@ -1061,8 +1040,7 @@ delete m_pDataSocket; m_pDataSocket = 0; - if (gotListReply) - { + if (gotListReply) { m_state++; SendNextCommand(); } @@ -1077,13 +1055,23 @@ CloseSocket(); } -void CNetConfWizard::operator()(CEventBase const& ev) +void CNetConfWizard::operator()(fz::event_base const& ev) { - if (Dispatch(ev, this, &CNetConfWizard::OnExternalIPAddress)) - return; + fz::dispatch(ev, this + , &CNetConfWizard::OnSocketEvent + , &CNetConfWizard::OnExternalIPAddress); } void CNetConfWizard::OnExternalIPAddress() { QueueEvent(new wxCommandEvent(fzEVT_ON_EXTERNAL_IP_ADDRESS)); } + +void CNetConfWizard::OnSocketEvent(CSocketEventSource* s, SocketEventType t, int error) +{ + if (!s) { + return; + } + + CallAfter([=]{DoOnSocketEvent(s, t, error);}); +} diff -Nru filezilla-3.14.1/src/interface/netconfwizard.h filezilla-3.15.0.2/src/interface/netconfwizard.h --- filezilla-3.14.1/src/interface/netconfwizard.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/netconfwizard.h 2016-02-05 08:54:46.000000000 +0000 @@ -4,14 +4,14 @@ #include #include "wrapengine.h" #include "externalipresolver.h" -#include #include +#include "socket.h" #define NETCONFBUFFERSIZE 100 class COptions; -class CNetConfWizard final : public wxWizard, protected CWrapEngine, protected CEventHandler +class CNetConfWizard final : public wxWizard, protected CWrapEngine, protected fz::event_handler { public: CNetConfWizard(wxWindow* parent, COptions* pOptions, CFileZillaEngineContext & context); @@ -34,14 +34,16 @@ DECLARE_EVENT_TABLE() void OnPageChanging(wxWizardEvent& event); void OnPageChanged(wxWizardEvent& event); - void OnSocketEvent(wxSocketEvent& event); void OnRestart(wxCommandEvent& event); void OnFinish(wxWizardEvent& event); void OnTimer(wxTimerEvent& event); void OnExternalIPAddress2(wxCommandEvent&); - virtual void operator()(CEventBase const& ev); + 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 OnReceive(); void ParseResponse(const char* line); @@ -65,7 +67,7 @@ wxString m_nextLabelText; // Test data - wxSocketClient* m_socket; + CSocket* m_socket{}; int m_state; char m_recvBuffer[NETCONFBUFFERSIZE]; @@ -88,8 +90,8 @@ CExternalIPResolver* m_pIPResolver; wxString m_externalIP; - wxSocketServer* m_pSocketServer; - wxSocketBase* m_pDataSocket; + CSocket* m_pSocketServer{}; + CSocket* m_pDataSocket{}; int m_listenPort; bool gotListReply; int m_data; diff -Nru filezilla-3.14.1/src/interface/Options.cpp filezilla-3.15.0.2/src/interface/Options.cpp --- filezilla-3.14.1/src/interface/Options.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/Options.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -190,6 +190,7 @@ { "Show Site Manager on startup", number, _T("0"), normal }, { "Prompt password change", number, _T("0"), normal }, { "Persistent Choices", number, _T("0"), normal }, + { "Show notification bubbles", number, _T("1"), normal }, // Default/internal options { "Config Location", string, _T(""), default_only }, @@ -273,7 +274,7 @@ if (nID >= OPTIONS_NUM) return 0; - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); return m_optionsCache[nID].numValue; } @@ -282,7 +283,7 @@ if (nID >= OPTIONS_NUM) return wxString(); - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); return m_optionsCache[nID].strValue; } @@ -321,7 +322,7 @@ T validated = Validate(nID, value); { - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); if (m_optionsCache[nID] == validated) { // Nothing to do return; @@ -359,7 +360,7 @@ if (nID >= OPTIONS_NUM) return false; - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); return m_optionsCache[nID].from_default; } @@ -674,11 +675,11 @@ wxString value = GetTextElement(option); if (options[iter->second].flags == default_priority) { if (allowDefault) { - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); m_optionsCache[iter->second].from_default = true; } else { - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); if (m_optionsCache[iter->second].from_default) return; } @@ -688,12 +689,12 @@ long numValue = 0; value.ToLong(&numValue); numValue = Validate(iter->second, numValue); - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); m_optionsCache[iter->second] = numValue; } else { value = Validate(iter->second, value); - scoped_lock l(m_sync_); + fz::scoped_lock l(m_sync_); m_optionsCache[iter->second] = value; } } @@ -859,7 +860,7 @@ void COptions::SetDefaultValues() { - scoped_lock l(m_sync_); + 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; diff -Nru filezilla-3.14.1/src/interface/Options.h filezilla-3.15.0.2/src/interface/Options.h --- filezilla-3.14.1/src/interface/Options.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/Options.h 2016-02-10 19:27:09.000000000 +0000 @@ -5,7 +5,7 @@ #include -#include +#include #include @@ -94,6 +94,7 @@ OPTION_INTERFACE_SITEMANAGER_ON_STARTUP, OPTION_PROMPTPASSWORDSAVE, OPTION_PERSISTENT_CHOICES, + OPTION_SHOW_NOTIFICATION_BUBBLE, // Default/internal options OPTION_DEFAULT_SETTINGSDIR, // guaranteed to be (back)slash-terminated @@ -182,7 +183,7 @@ DECLARE_EVENT_TABLE() void OnTimer(wxTimerEvent& event); - mutex m_sync_; + fz::mutex m_sync_; changed_options_t changedOptions_; }; diff -Nru filezilla-3.14.1/src/interface/power_management.cpp filezilla-3.15.0.2/src/interface/power_management.cpp --- filezilla-3.14.1/src/interface/power_management.cpp 2015-06-18 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/power_management.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -49,19 +49,16 @@ #endif } -void CPowerManagement::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2) +void CPowerManagement::OnStateChange(CState*, t_statechange_notifications, wxString const&, void const*) { - if (m_pMainFrame->GetQueue()->IsActive()) - { + if (m_pMainFrame->GetQueue()->IsActive()) { DoSetBusy(); return; } const std::vector *states = CContextManager::Get()->GetAllStates(); - for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) - { - if (!(*iter)->IsRemoteIdle()) - { + for (std::vector::const_iterator iter = states->begin(); iter != states->end(); ++iter) { + if (!(*iter)->IsRemoteIdle()) { DoSetBusy(); return; } diff -Nru filezilla-3.14.1/src/interface/power_management.h filezilla-3.15.0.2/src/interface/power_management.h --- filezilla-3.14.1/src/interface/power_management.h 2014-05-01 19:29:21.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/power_management.h 2016-02-05 08:54:46.000000000 +0000 @@ -30,7 +30,7 @@ static CPowerManagement* m_pPowerManagement; - 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, wxString const& data, void const* data2); void DoSetBusy(); void DoSetIdle(); diff -Nru filezilla-3.14.1/src/interface/queue.cpp filezilla-3.15.0.2/src/interface/queue.cpp --- filezilla-3.14.1/src/interface/queue.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/queue.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -135,13 +135,19 @@ }; if (forward) { - for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end() && !deleted; ++iter) { + for (auto iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter ) { doRemove(iter); + if (deleted) { + break; + } } } else { - for (auto iter = m_children.rbegin(); iter != m_children.rend() - m_removed_at_front && !deleted; ++iter) { + for (auto iter = m_children.rbegin(); iter != m_children.rend() - m_removed_at_front; ++iter ) { doRemove(iter.base() - 1); + if (deleted) { + break; + } } } @@ -219,7 +225,7 @@ const CLocalPath& localPath, const CServerPath& remotePath, int64_t size) : CQueueItem(parent) , m_sourceFile(sourceFile) - , m_targetFile(targetFile.empty() ? CSparseOptional() : CSparseOptional(to_fzstring(targetFile))) + , m_targetFile(targetFile.empty() ? CSparseOptional() : CSparseOptional(to_wstring(targetFile))) , m_localPath(localPath) , m_remotePath(remotePath) , m_size(size) @@ -305,7 +311,7 @@ void CFileItem::SetTargetFile(wxString const& file) { if (!file.empty() && file != m_sourceFile) - m_targetFile = CSparseOptional(to_fzstring(file)); + m_targetFile = CSparseOptional(to_wstring(file)); else m_targetFile.clear(); } @@ -1432,7 +1438,7 @@ m_pQueue->SetSelection(selection); } -void CQueueViewBase::OnEndColumnDrag(wxListEvent& event) +void CQueueViewBase::OnEndColumnDrag(wxListEvent&) { for (unsigned int i = 0; i < m_pQueue->GetPageCount(); i++) { diff -Nru filezilla-3.14.1/src/interface/queue.h filezilla-3.15.0.2/src/interface/queue.h --- filezilla-3.14.1/src/interface/queue.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/queue.h 2016-02-05 08:54:46.000000000 +0000 @@ -55,8 +55,8 @@ virtual QueueItemType GetType() const = 0; - CDateTime GetTime() const { return m_time; } - void UpdateTime() { m_time = CDateTime::Now(); } + fz::datetime GetTime() const { return m_time; } + void UpdateTime() { m_time = fz::datetime::now(); } int GetRemovedAtFront() const { return m_removed_at_front; } @@ -67,7 +67,7 @@ friend class CServerItem; - CDateTime m_time; + fz::datetime m_time; private: std::vector m_children; @@ -156,10 +156,10 @@ void SetPriorityRaw(QueuePriority priority); QueuePriority GetPriority() const; - fzstring const& GetLocalFile() const { return !Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); } - fzstring const& GetRemoteFile() const { return Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); } - fzstring const& GetSourceFile() const { return m_sourceFile; } - CSparseOptional const& GetTargetFile() const { return m_targetFile; } + 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; } CLocalPath const& GetLocalPath() const { return m_localPath; } CServerPath const& GetRemotePath() const { return m_remotePath; } int64_t GetSize() const { return m_size; } @@ -191,7 +191,7 @@ virtual void SaveItem(pugi::xml_node& element) const; - virtual bool TryRemoveAll(); // Removes a inactive childrens, queues active children for removal. + virtual bool TryRemoveAll(); // Removes inactive children, queues active children for removal. // Returns true if item can be removed itself void SetTargetFile(wxString const& file); @@ -261,8 +261,8 @@ } protected: - fzstring const m_sourceFile; - CSparseOptional m_targetFile; + std::wstring const m_sourceFile; + CSparseOptional m_targetFile; CLocalPath const m_localPath; CServerPath const m_remotePath; int64_t m_size{}; diff -Nru filezilla-3.14.1/src/interface/QueueView.cpp filezilla-3.15.0.2/src/interface/QueueView.cpp --- filezilla-3.14.1/src/interface/QueueView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/QueueView.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -21,7 +21,6 @@ #include #include #include -#include "local_filesys.h" #include "statusbar.h" #include "recursive_operation.h" #include "auto_ascii_files.h" @@ -29,8 +28,12 @@ #include "drop_target_ex.h" #if WITH_LIBDBUS #include "../dbus/desktop_notification.h" +#elif defined(__WXGTK__) || defined(__WXMSW__) +#include #endif +#include + #ifdef __WXMSW__ #include #endif @@ -209,7 +212,7 @@ EVT_SIZE(CQueueView::OnSize) END_EVENT_TABLE() -class CFolderProcessingThread final : public wxThread +class CFolderProcessingThread final : public fz::thread { struct t_internalDirPair { @@ -218,15 +221,10 @@ }; public: CFolderProcessingThread(CQueueView* pOwner, CFolderScanItem* pFolderItem) - : wxThread(wxTHREAD_JOINABLE) { + { m_pOwner = pOwner; m_pFolderItem = pFolderItem; - m_didSendEvent = false; - m_threadWaiting = false; - m_throttleWait = false; - m_processing_entries = false; - t_internalDirPair* pair = new t_internalDirPair; pair->localPath = pFolderItem->GetLocalPath(); pair->remotePath = pFolderItem->GetRemotePath(); @@ -235,6 +233,11 @@ 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) @@ -244,7 +247,7 @@ void GetFiles(std::list &entryList) { wxASSERT(entryList.empty()); - scoped_lock locker(m_sync); + fz::scoped_lock locker(m_sync); entryList.swap(m_entryList); m_didSendEvent = false; @@ -266,7 +269,7 @@ void ProcessDirectory(const CLocalPath& localPath, CServerPath const& remotePath, const wxString& name) { - scoped_lock locker(m_sync); + fz::scoped_lock locker(m_sync); t_internalDirPair* pair = new t_internalDirPair; @@ -288,7 +291,7 @@ void CheckFinished() { - scoped_lock locker(m_sync); + fz::scoped_lock locker(m_sync); wxASSERT(m_processing_entries); m_processing_entries = false; @@ -308,7 +311,7 @@ void AddEntry(CFolderProcessingEntry* entry) { - scoped_lock l(m_sync); + fz::scoped_lock l(m_sync); m_entryList.push_back(entry); // Wait if there are more than 100 items to queue, @@ -341,7 +344,7 @@ } } - ExitCode Entry() + void entry() { #ifdef __WXDEBUG__ wxMutexGuiEnter(); @@ -351,10 +354,13 @@ wxASSERT(!m_pFolderItem->Download()); - CLocalFileSystem localFileSystem; + fz::local_filesys localFileSystem; - while (!TestDestroy() && !m_pFolderItem->m_remove) { - scoped_lock l(m_sync); + 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; @@ -379,7 +385,7 @@ l.unlock(); - if (!localFileSystem.BeginFindFiles(pair->localPath.GetPath(), false)) { + if (!localFileSystem.begin_find_files(fz::to_native(pair->localPath.GetPath()), false)) { delete pair; continue; } @@ -391,10 +397,10 @@ t_newEntry* entry = new t_newEntry; - wxString name; + fz::native_string name; bool is_link; bool is_dir; - while (localFileSystem.GetNextFile(name, is_link, is_dir, &entry->size, &entry->time, &entry->attributes)) { + while (localFileSystem.get_next_file(name, is_link, is_dir, &entry->size, &entry->time, &entry->attributes)) { if (is_link) continue; @@ -411,7 +417,6 @@ } m_pOwner->QueueEvent(new wxCommandEvent(fzEVT_FOLDERTHREAD_COMPLETE, wxID_ANY)); - return 0; } std::list m_dirsToCheck; @@ -422,12 +427,13 @@ CQueueView* m_pOwner; CFolderScanItem* m_pFolderItem; - mutex m_sync; - condition m_condition; - bool m_threadWaiting; - bool m_throttleWait; - bool m_didSendEvent; - bool m_processing_entries; + fz::mutex m_sync; + fz::condition m_condition; + bool m_threadWaiting{}; + bool m_throttleWait{}; + bool m_didSendEvent{}; + bool m_processing_entries{}; + bool m_quit{}; }; CQueueView::CQueueView(CQueue* parent, int index, CMainFrame* pMainFrame, CAsyncRequestQueue *pAsyncRequestQueue) @@ -445,8 +451,7 @@ m_quit = 0; m_waitStatusLineUpdate = false; m_lastTopItem = -1; - m_pFolderProcessingThread = 0; - + m_totalQueueSize = 0; m_filesWithUnknownSize = 0; @@ -470,26 +475,16 @@ #endif m_resize_timer.SetOwner(this); - -#if WITH_LIBDBUS - m_desktop_notification = 0; -#endif } CQueueView::~CQueueView() { - if (m_pFolderProcessingThread) { - m_pFolderProcessingThread->Delete(0, wxTHREAD_WAIT_BLOCK); - delete m_pFolderProcessingThread; - } + delete m_pFolderProcessingThread; + m_pFolderProcessingThread = 0; DeleteEngines(); m_resize_timer.Stop(); - -#if WITH_LIBDBUS - delete m_desktop_notification; -#endif } bool CQueueView::QueueFile(const bool queueOnly, const bool download, @@ -1693,8 +1688,7 @@ void CQueueView::ProcessUploadFolderItems() { - if (m_queuedFolders[1].empty()) - { + if (m_queuedFolders[1].empty()) { if (m_quit) m_pMainFrame->Close(); @@ -1713,8 +1707,7 @@ RefreshItem(pItem); pItem->m_active = true; m_pFolderProcessingThread = new CFolderProcessingThread(this, pItem); - m_pFolderProcessingThread->Create(); - m_pFolderProcessingThread->Run(); + m_pFolderProcessingThread->run(); RefreshListOnly(false); } @@ -1728,8 +1721,7 @@ wxASSERT(!m_queuedFolders[1].empty()); CFolderScanItem* pItem = m_queuedFolders[1].front(); - if (pItem->m_dir_is_empty) - { + 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); @@ -1739,7 +1731,6 @@ RemoveItem(pItem, true); - m_pFolderProcessingThread->Wait(wxTHREAD_WAIT_BLOCK); delete m_pFolderProcessingThread; m_pFolderProcessingThread = 0; @@ -2921,8 +2912,7 @@ // 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++) - { + for (unsigned int i = 0; i < pStates->size(); ++i) { CState *pState = (*pStates)[i]; CRecursiveOperation *pRecursiveOperationHandler; if (!pState || !(pRecursiveOperationHandler = pState->GetRecursiveOperationHandler())) @@ -2935,21 +2925,28 @@ } } -#if WITH_LIBDBUS - if (!m_pMainFrame->IsActive()) - { - if (!m_desktop_notification) - m_desktop_notification = new CDesktopNotification; - int failed_count = m_pQueue->GetQueueView_Failed()->GetFileCount(); - if (failed_count != 0) - { + 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); - m_desktop_notification->Notify(_("Transfers finished"), wxString::Format(fmt, failed_count), _T("transfer.error")); + msg = wxString::Format(fmt, failed_count); } else - m_desktop_notification->Notify(_("Transfers finished"), _("All files have been successfully transferred"), _T("transfer.complete")); - } + 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")); +#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); #endif + } switch (m_actionAfterState) { diff -Nru filezilla-3.14.1/src/interface/queueview_failed.cpp filezilla-3.15.0.2/src/interface/queueview_failed.cpp --- filezilla-3.14.1/src/interface/queueview_failed.cpp 2015-04-03 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/queueview_failed.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -26,7 +26,7 @@ { } -void CQueueViewFailed::OnContextMenu(wxContextMenuEvent& event) +void CQueueViewFailed::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_QUEUE_FAILED")); if (!pMenu) @@ -47,7 +47,7 @@ delete pMenu; } -void CQueueViewFailed::OnRemoveAll(wxCommandEvent& event) +void CQueueViewFailed::OnRemoveAll(wxCommandEvent&) { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) @@ -81,7 +81,7 @@ m_pQueue->SetSelection(0); } -void CQueueViewFailed::OnRemoveSelected(wxCommandEvent& event) +void CQueueViewFailed::OnRemoveSelected(wxCommandEvent&) { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) @@ -240,7 +240,7 @@ return ret; } -void CQueueViewFailed::OnRequeueSelected(wxCommandEvent& event) +void CQueueViewFailed::OnRequeueSelected(wxCommandEvent&) { #ifndef __WXMSW__ // GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1) @@ -312,7 +312,7 @@ wxMessageBoxEx(_("Not all items could be requeued for transfer.")); } -void CQueueViewFailed::OnRequeueAll(wxCommandEvent& event) +void CQueueViewFailed::OnRequeueAll(wxCommandEvent&) { bool ret = true; while (!m_serverList.empty()) diff -Nru filezilla-3.14.1/src/interface/QueueView.h filezilla-3.15.0.2/src/interface/QueueView.h --- filezilla-3.14.1/src/interface/QueueView.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/QueueView.h 2016-02-05 08:54:46.000000000 +0000 @@ -4,7 +4,7 @@ #include "dndobjects.h" #include "queue.h" -#include +#include #include #include @@ -35,7 +35,7 @@ wxString name; int64_t size{}; - CDateTime time; + fz::datetime time; int attributes{}; bool dir{}; }; @@ -110,6 +110,8 @@ class CQueue; #if WITH_LIBDBUS class CDesktopNotification; +#elif defined(__WXGTK__) || defined(__WXMSW__) +class wxNotificationMessage; #endif class CQueueView : public CQueueViewBase, public COptionChangeEventHandler @@ -230,7 +232,7 @@ void TryRefreshListings(); CServer m_last_refresh_server; CServerPath m_last_refresh_path; - CMonotonicClock m_last_refresh_listing_time; + fz::monotonic_clock m_last_refresh_listing_time; // Called from Process Reply. // After a disconnect, check if there's another idle engine that @@ -254,7 +256,7 @@ void RemoveQueuedFolderItem(CFolderScanItem* pFolder); - CFolderProcessingThread *m_pFolderProcessingThread; + CFolderProcessingThread *m_pFolderProcessingThread{}; /* * Don't update status line positions if m_waitStatusLineUpdate is true. @@ -304,7 +306,9 @@ void ReleaseExclusiveEngineLock(CFileZillaEngine* pEngine); #if WITH_LIBDBUS - CDesktopNotification* m_desktop_notification; + std::unique_ptr m_desktop_notification; +#elif defined(__WXGTK__) || defined(__WXMSW__) + std::unique_ptr m_desktop_notification; #endif CQueueStorage m_queue_storage; diff -Nru filezilla-3.14.1/src/interface/queueview_successful.cpp filezilla-3.15.0.2/src/interface/queueview_successful.cpp --- filezilla-3.14.1/src/interface/queueview_successful.cpp 2014-05-01 19:29:21.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/queueview_successful.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -18,7 +18,7 @@ m_autoClear = COptions::Get()->GetOptionVal(OPTION_QUEUE_SUCCESSFUL_AUTOCLEAR) ? true : false; } -void CQueueViewSuccessful::OnContextMenu(wxContextMenuEvent& event) +void CQueueViewSuccessful::OnContextMenu(wxContextMenuEvent&) { wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_QUEUE_SUCCESSFUL")); if (!pMenu) diff -Nru filezilla-3.14.1/src/interface/quickconnectbar.cpp filezilla-3.15.0.2/src/interface/quickconnectbar.cpp --- filezilla-3.14.1/src/interface/quickconnectbar.cpp 2015-09-01 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/quickconnectbar.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -139,7 +139,7 @@ CRecentServerList::SetMostRecentServer(server); } -void CQuickconnectBar::OnQuickconnectDropdown(wxCommandEvent& event) +void CQuickconnectBar::OnQuickconnectDropdown(wxCommandEvent&) { wxMenu* pMenu = new wxMenu; diff -Nru filezilla-3.14.1/src/interface/recursive_operation.cpp filezilla-3.15.0.2/src/interface/recursive_operation.cpp --- filezilla-3.14.1/src/interface/recursive_operation.cpp 2015-08-03 17:45:45.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/recursive_operation.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -5,7 +5,37 @@ #include "filter.h" #include "Options.h" #include "queue.h" -#include "local_filesys.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), @@ -24,7 +54,7 @@ } } -void CRecursiveOperation::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void* data2) +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); @@ -36,11 +66,18 @@ } } -void CRecursiveOperation::StartRecursiveOperation(OperationMode mode, const CServerPath& startDir, std::vector const& filters, bool allowParent /*=false*/, const CServerPath& finalDir /*=CServerPath()*/) +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(!startDir.empty(), _T("Empty startDir in StartRecursiveOperation")); + wxCHECK_RET(!finalDir.empty(), _T("Empty final dir in recursive operation")); if (mode == recursive_chmod && !m_pChmodDlg) return; @@ -48,7 +85,7 @@ if ((mode == recursive_download || mode == recursive_addtoqueue || mode == recursive_download_flatten || mode == recursive_addtoqueue_flatten) && !m_pQueue) return; - if (m_dirsToVisit.empty()) { + if (recursion_roots_.empty()) { // Nothing to do in this case return; } @@ -60,56 +97,32 @@ m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); m_pState->NotifyHandlers(STATECHANGE_RECURSION_STATUS); - m_startDir = startDir; - - if (finalDir.empty()) - m_finalDir = startDir; - else - m_finalDir = finalDir; - - m_allowParent = allowParent; - m_filters = filters; NextOperation(); } -void CRecursiveOperation::AddDirectoryToVisit(const CServerPath& path, const wxString& subdir, const CLocalPath& localDir /*=CLocalPath()*/, bool is_link /*=false*/) -{ - CNewDir dirToVisit; - - dirToVisit.localDir = localDir; - dirToVisit.parent = path; - dirToVisit.subdir = subdir; - dirToVisit.link = is_link ? 2 : 0; - m_dirsToVisit.push_back(dirToVisit); -} - -void CRecursiveOperation::AddDirectoryToVisitRestricted(const CServerPath& path, const wxString& restrict, bool recurse) -{ - CNewDir dirToVisit; - dirToVisit.parent = path; - dirToVisit.recurse = recurse; - dirToVisit.restrict = restrict; - m_dirsToVisit.push_back(dirToVisit); -} - bool CRecursiveOperation::NextOperation() { if (m_operationMode == recursive_none) return false; - while (!m_dirsToVisit.empty()) { - const CNewDir& dirToVisit = m_dirsToVisit.front(); - if (m_operationMode == recursive_delete && !dirToVisit.doVisit) { - m_pState->m_pCommandQueue->ProcessCommand(new CRemoveDirCommand(dirToVisit.parent, dirToVisit.subdir), CCommandQueue::recursiveOperation); - m_dirsToVisit.pop_front(); - continue; + 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; } - 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()) { @@ -127,7 +140,7 @@ return false; } -bool CRecursiveOperation::BelowRecursionRoot(const CServerPath& path, CNewDir &dir) +bool CRecursiveOperation::BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir) { if (!dir.start_dir.empty()) { if (path.IsSubdirOf(dir.start_dir, false)) @@ -136,12 +149,13 @@ return false; } - if (path.IsSubdirOf(m_startDir, 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 == m_startDir && m_allowParent) + if (path == root.m_startDir && root.m_allowParent) return true; if (dir.link == 2) { @@ -162,7 +176,7 @@ return; } - if (m_operationMode == recursive_none) + if (m_operationMode == recursive_none || recursion_roots_.empty()) return; if (pDirectoryListing->failed()) { @@ -171,15 +185,16 @@ return; } - wxASSERT(!m_dirsToVisit.empty()); + auto & root = recursion_roots_.front(); + wxASSERT(!root.m_dirsToVisit.empty()); - if (!m_pState->IsRemoteConnected() || m_dirsToVisit.empty()) { + if (!m_pState->IsRemoteConnected() || root.m_dirsToVisit.empty()) { StopRecursiveOperation(); return; } - CNewDir dir = m_dirsToVisit.front(); - m_dirsToVisit.pop_front(); + recursion_root::new_dir dir = root.m_dirsToVisit.front(); + root.m_dirsToVisit.pop_front(); if (!BelowRecursionRoot(pDirectoryListing->path, dir)) { NextOperation(); @@ -189,9 +204,9 @@ 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 - CNewDir dir2 = dir; + recursion_root::new_dir dir2 = dir; dir2.doVisit = false; - m_dirsToVisit.push_front(dir2); + root.m_dirsToVisit.push_front(dir2); } if (dir.link && !dir.recurse) { @@ -200,7 +215,7 @@ } // Check if we have already visited the directory - if (!m_visitedDirs.insert(pDirectoryListing->path).second) { + if (!root.m_visitedDirs.insert(pDirectoryListing->path).second) { NextOperation(); return; } @@ -224,7 +239,7 @@ CFilterManager filter; // Is operation restricted to a single child? - bool restrict = !dir.restrict.empty(); + bool const restrict = static_cast(dir.restrict); std::deque filesToDelete; @@ -236,10 +251,10 @@ const CDirentry& entry = (*pDirectoryListing)[i]; if (restrict) { - if (entry.name != dir.restrict) + if (entry.name != *dir.restrict) continue; } - else if (filter.FilenameFiltered(m_filters, entry.name, path, entry.is_dir(), entry.size, false, 0, entry.time)) + else if (filter.FilenameFiltered(m_filters, entry.name, path, entry.is_dir(), entry.size, 0, entry.time)) continue; if (!entry.is_dir()) { @@ -248,7 +263,7 @@ if (entry.is_dir() && (!entry.is_link() || m_operationMode != recursive_delete)) { if (dir.recurse) { - CNewDir dirToVisit; + recursion_root::new_dir dirToVisit; dirToVisit.parent = pDirectoryListing->path; dirToVisit.subdir = entry.name; dirToVisit.localDir = dir.localDir; @@ -260,7 +275,7 @@ dirToVisit.link = 1; dirToVisit.recurse = false; } - m_dirsToVisit.push_front(dirToVisit); + root.m_dirsToVisit.push_front(dirToVisit); } } else { @@ -339,8 +354,7 @@ m_pState->NotifyHandlers(STATECHANGE_REMOTE_IDLE); m_pState->NotifyHandlers(STATECHANGE_RECURSION_STATUS); } - m_dirsToVisit.clear(); - m_visitedDirs.clear(); + recursion_roots_.clear(); if (m_pChmodDlg) { m_pChmodDlg->Destroy(); @@ -350,7 +364,7 @@ void CRecursiveOperation::ListingFailed(int error) { - if (m_operationMode == recursive_none) + if (m_operationMode == recursive_none || recursion_roots_.empty()) return; if( (error & FZ_REPLY_CANCELED) == FZ_REPLY_CANCELED) { @@ -359,18 +373,16 @@ return; } - wxASSERT(!m_dirsToVisit.empty()); - if (m_dirsToVisit.empty()) - return; + auto & root = recursion_roots_.front(); + wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); - CNewDir dir = m_dirsToVisit.front(); - m_dirsToVisit.pop_front(); - if ((error & FZ_REPLY_CRITICALERROR) != FZ_REPLY_CRITICALERROR && !dir.second_try) - { + 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; - m_dirsToVisit.push_front(dir); + root.m_dirsToVisit.push_front(dir); } NextOperation(); @@ -393,15 +405,14 @@ void CRecursiveOperation::LinkIsNotDir() { - if (m_operationMode == recursive_none) + if (m_operationMode == recursive_none || recursion_roots_.empty()) return; - wxASSERT(!m_dirsToVisit.empty()); - if (m_dirsToVisit.empty()) - return; + auto & root = recursion_roots_.front(); + wxCHECK_RET(!root.m_dirsToVisit.empty(), _T("Empty dirs to visit")); - CNewDir dir = m_dirsToVisit.front(); - m_dirsToVisit.pop_front(); + recursion_root::new_dir dir = root.m_dirsToVisit.front(); + root.m_dirsToVisit.pop_front(); const CServer* pServer = m_pState->GetServer(); if (!pServer) { diff -Nru filezilla-3.14.1/src/interface/recursive_operation.h filezilla-3.15.0.2/src/interface/recursive_operation.h --- filezilla-3.14.1/src/interface/recursive_operation.h 2015-06-18 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/recursive_operation.h 2016-02-05 08:54:46.000000000 +0000 @@ -4,10 +4,53 @@ #include "state.h" #include #include "filter.h" +#include class CChmodDialog; class CQueueView; +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, 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); + + bool empty() const { return m_dirsToVisit.empty(); } + +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: @@ -26,11 +69,10 @@ recursive_list }; - void StartRecursiveOperation(OperationMode mode, const CServerPath& startDir, std::vector const& filters, bool allowParent = false, const CServerPath& finalDir = CServerPath()); - void StopRecursiveOperation(); + void AddRecursionRoot(recursion_root && root); + void StartRecursiveOperation(OperationMode mode, std::vector const& filters, CServerPath const& finalDir); - void AddDirectoryToVisit(const CServerPath& path, const wxString& subdir, const CLocalPath& localDir = CLocalPath(), bool is_link = false); - void AddDirectoryToVisitRestricted(const CServerPath& path, const wxString& restrict, bool recurse); + void StopRecursiveOperation(); bool IsActive() const { return GetOperationMode() != recursive_none; } OperationMode GetOperationMode() const { return m_operationMode; } @@ -40,14 +82,14 @@ // Needed for recursive_chmod void SetChmodDialog(CChmodDialog* pChmodDialog); - void ListingFailed(int error); - void LinkIsNotDir(); - void SetQueue(CQueueView* pQueue); bool ChangeOperationMode(OperationMode mode); protected: + void LinkIsNotDir(); + void ListingFailed(int error); + // Processes the directory listing in case of a recursive operation void ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing); @@ -57,37 +99,11 @@ OperationMode m_operationMode; - class CNewDir final - { - public: - CServerPath parent; - wxString subdir; - CLocalPath localDir; - bool doVisit{true}; + bool BelowRecursionRoot(const CServerPath& path, recursion_root::new_dir &dir); - bool recurse{true}; - wxString restrict; + std::deque recursion_roots_; - bool second_try{}; - - // 0 = not a link - // 1 = link, added by class during the operation - // 2 = link, added by user of class - int link{}; - - // Symlink target might be outside actual start dir. Yet - // sometimes user wants to download symlink target contents - CServerPath start_dir; - }; - - bool BelowRecursionRoot(const CServerPath& path, CNewDir &dir); - - CServerPath m_startDir; CServerPath m_finalDir; - std::set m_visitedDirs; - std::deque m_dirsToVisit; - - bool m_allowParent{}; // Needed for recursive_chmod CChmodDialog* m_pChmodDlg{}; diff -Nru filezilla-3.14.1/src/interface/recursive_operation_status.cpp filezilla-3.15.0.2/src/interface/recursive_operation_status.cpp --- filezilla-3.14.1/src/interface/recursive_operation_status.cpp 2015-07-31 15:24:14.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/recursive_operation_status.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -57,7 +57,7 @@ return ret; } -void CRecursiveOperationStatus::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString&, const void*) +void CRecursiveOperationStatus::OnStateChange(CState*, enum t_statechange_notifications, const wxString&, const void*) { auto const mode = m_pState->GetRecursiveOperationHandler()->GetOperationMode(); bool show = mode != CRecursiveOperation::recursive_none && mode != CRecursiveOperation::recursive_list; @@ -120,7 +120,7 @@ dc.DrawLine(wxPoint(0, 0), wxPoint(s.GetWidth(), 0)); } -void CRecursiveOperationStatus::OnCancel(wxCommandEvent& ev) +void CRecursiveOperationStatus::OnCancel(wxCommandEvent&) { m_pState->GetRecursiveOperationHandler()->StopRecursiveOperation(); m_pState->RefreshRemote(); diff -Nru filezilla-3.14.1/src/interface/RemoteListView.cpp filezilla-3.15.0.2/src/interface/RemoteListView.cpp --- filezilla-3.14.1/src/interface/RemoteListView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/RemoteListView.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1207,17 +1207,16 @@ wxASSERT(local_parent.IsWriteable()); const CServer* pServer = m_pState->GetServer(); - if (!pServer) - { + if (!pServer) { wxBell(); return; } bool added = false; - bool startRecursive = false; long item = -1; - for (;;) - { + + recursion_root root(m_pDirectoryListing->path, false); + for (;;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == -1) break; @@ -1233,21 +1232,17 @@ const CDirentry& entry = (*m_pDirectoryListing)[index]; const wxString& name = entry.name; - if (entry.is_dir()) - { + if (entry.is_dir()) { if (!idle) continue; CLocalPath local_path(local_parent); local_path.AddSegment(CQueueView::ReplaceInvalidCharacters(name)); CServerPath remotePath = m_pDirectoryListing->path; - if (remotePath.AddSegment(name)) - { - pRecursiveOperation->AddDirectoryToVisit(m_pDirectoryListing->path, name, local_path, entry.is_link()); - startRecursive = true; + if (remotePath.AddSegment(name)) { + root.add_dir_to_visit(m_pDirectoryListing->path, name, local_path, entry.is_link()); } } - else - { + else { wxString localFile = CQueueView::ReplaceInvalidCharacters(name); if (m_pDirectoryListing->path.GetType() == VMS && COptions::Get()->GetOptionVal(OPTION_STRIP_VMS_REVISION)) localFile = StripVMSRevision(localFile); @@ -1260,12 +1255,13 @@ if (added) m_pQueue->QueueFile_Finish(!queueOnly); - if (startRecursive) - { + if (!root.empty()) { + pRecursiveOperation->AddRecursionRoot(std::move(root)); if (IsComparing()) ExitComparisonMode(); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, m_pDirectoryListing->path, filter.GetActiveFilters(false)); + pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, + filter.GetActiveFilters(false), m_pDirectoryListing->path); } } @@ -1414,10 +1410,8 @@ std::deque filesToDelete; - bool startRecursive = false; - item = -1; - for (;;) - { + recursion_root root(m_pDirectoryListing->path, false); + for (item = -1; ;) { item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (!item) continue; @@ -1433,13 +1427,10 @@ const CDirentry& entry = (*m_pDirectoryListing)[index]; const wxString& name = entry.name; - if (entry.is_dir() && (follow_symlink || !entry.is_link())) - { + if (entry.is_dir() && (follow_symlink || !entry.is_link())) { CServerPath remotePath = m_pDirectoryListing->path; - if (remotePath.AddSegment(name)) - { - pRecursiveOperation->AddDirectoryToVisit(m_pDirectoryListing->path, name, CLocalPath(), true); - startRecursive = true; + if (remotePath.AddSegment(name)) { + root.add_dir_to_visit(m_pDirectoryListing->path, name, CLocalPath(), true);; } } else @@ -1449,12 +1440,14 @@ if (!filesToDelete.empty()) m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(m_pDirectoryListing->path, std::move(filesToDelete))); - if (startRecursive) - { + if (!root.empty()) { if (IsComparing()) ExitComparisonMode(); + pRecursiveOperation->AddRecursionRoot(std::move(root)); + CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, m_pDirectoryListing->path, filter.GetActiveFilters(false)); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, + filter.GetActiveFilters(false), m_pDirectoryListing->path); } } @@ -1690,6 +1683,7 @@ CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); wxASSERT(pRecursiveOperation); + recursion_root root(m_pDirectoryListing->path, false); item = -1; for (;;) { @@ -1726,7 +1720,7 @@ } if (pChmodDlg->Recursive() && entry.is_dir()) - pRecursiveOperation->AddDirectoryToVisit(m_pDirectoryListing->path, entry.name); + root.add_dir_to_visit(m_pDirectoryListing->path, entry.name); } if (pChmodDlg->Recursive()) { @@ -1734,8 +1728,10 @@ ExitComparisonMode(); pRecursiveOperation->SetChmodDialog(pChmodDlg); + pRecursiveOperation->AddRecursionRoot(std::move(root)); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, m_pDirectoryListing->path, filter.GetActiveFilters(false)); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, + filter.GetActiveFilters(false), m_pDirectoryListing->path); // Refresh listing. This gets done implicitely by the recursive operation, so // only it if not recursing. @@ -1851,8 +1847,7 @@ } int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); - if (item != -1) - { + if (item != -1) { int index = GetItemIndex(item); if (index != -1 && m_fileData[index].comparison_flags != fill) { @@ -1873,25 +1868,21 @@ if (!GetItemCount()) return; - if (focused == _T("..")) - { + if (focused == _T("..")) { focused = _T(""); SetItemState(0, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); } - if (selectedNames.empty()) - { + if (selectedNames.empty()) { if (focused.empty()) return; - for (unsigned int i = 1; i < m_indexMapping.size(); i++) - { + for (unsigned int i = 1; i < m_indexMapping.size(); ++i) { const int index = m_indexMapping[i]; if (m_fileData[index].comparison_flags == fill) continue; - if ((*m_pDirectoryListing)[index].name == focused) - { + if ((*m_pDirectoryListing)[index].name == focused) { SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); if (ensureVisible) EnsureVisible(i); @@ -1901,8 +1892,7 @@ return; } - if (selectedNames.front() == _T("..")) - { + if (selectedNames.front() == _T("..")) { selectedNames.pop_front(); SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -2304,7 +2294,7 @@ } } -bool CRemoteListView::GetNextFile(wxString& name, bool& dir, int64_t& size, CDateTime& date) +bool CRemoteListView::get_next_file(wxString& name, bool& dir, int64_t& size, fz::datetime& date) { if (++m_comparisonIndex >= (int)m_originalIndexMapping.size()) return false; diff -Nru filezilla-3.14.1/src/interface/RemoteListView.h filezilla-3.15.0.2/src/interface/RemoteListView.h --- filezilla-3.14.1/src/interface/RemoteListView.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/RemoteListView.h 2016-02-05 08:54:46.000000000 +0000 @@ -19,7 +19,7 @@ virtual bool CanStartComparison(); virtual void StartComparison(); - virtual bool GetNextFile(wxString& name, bool &dir, int64_t &size, CDateTime& date); + virtual bool get_next_file(wxString& name, bool &dir, int64_t &size, fz::datetime& date); virtual void FinishComparison(); virtual void OnExitComparisonMode(); diff -Nru filezilla-3.14.1/src/interface/RemoteTreeView.cpp filezilla-3.15.0.2/src/interface/RemoteTreeView.cpp --- filezilla-3.14.1/src/interface/RemoteTreeView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/RemoteTreeView.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -947,8 +947,7 @@ const int applyType = pChmodDlg->GetApplyType(); - CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); - + recursion_root root(hasParent ? path.GetParent() : path, !cached); if (cached) { // Implies hasParent // Change directory permissions if (!applyType || applyType == 2) { @@ -959,16 +958,18 @@ if (pChmodDlg->Recursive()) // Start recursion - pRecursiveOperation->AddDirectoryToVisit(path, _T(""), CLocalPath()); + root.add_dir_to_visit(path, _T(""), CLocalPath()); } else { if (hasParent) - pRecursiveOperation->AddDirectoryToVisitRestricted(path.GetParent(), name, pChmodDlg->Recursive()); + root.add_dir_to_visit_restricted(path.GetParent(), name, pChmodDlg->Recursive()); else - pRecursiveOperation->AddDirectoryToVisitRestricted(path, _T(""), pChmodDlg->Recursive()); + root.add_dir_to_visit_restricted(path, _T(""), pChmodDlg->Recursive()); } if (!cached || pChmodDlg->Recursive()) { + CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + pRecursiveOperation->AddRecursionRoot(std::move(root)); pRecursiveOperation->SetChmodDialog(pChmodDlg); CServerPath currentPath; @@ -976,7 +977,7 @@ if (selected) currentPath = GetPathFromItem(selected); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, hasParent ? path.GetParent() : path, filter.GetActiveFilters(false), !cached, currentPath); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_chmod, filter.GetActiveFilters(false), currentPath); } else { pChmodDlg->Destroy(); @@ -1010,8 +1011,10 @@ localDir.AddSegment(CQueueView::ReplaceInvalidCharacters(name)); + recursion_root root(path, true); + root.add_dir_to_visit(path, _T(""), localDir); CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); - pRecursiveOperation->AddDirectoryToVisit(path, _T(""), localDir); + pRecursiveOperation->AddRecursionRoot(std::move(root)); CServerPath currentPath; const wxTreeItemId selected = GetSelection(); @@ -1020,7 +1023,7 @@ const bool addOnly = event.GetId() == XRCID("ID_ADDTOQUEUE"); CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(addOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, path, filter.GetActiveFilters(false), true, currentPath); + pRecursiveOperation->StartRecursiveOperation(addOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, filter.GetActiveFilters(false), currentPath); } void CRemoteTreeView::OnMenuDelete(wxCommandEvent&) @@ -1042,16 +1045,20 @@ CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler(); + recursion_root root; CServerPath startDir; if (hasParent) { const wxString& name = GetItemText(m_contextMenuItem); startDir = pathToDelete.GetParent(); - pRecursiveOperation->AddDirectoryToVisit(startDir, name); + root = recursion_root(startDir, !hasParent); + root.add_dir_to_visit(startDir, name); } else { startDir = pathToDelete; - pRecursiveOperation->AddDirectoryToVisit(startDir, _T("")); + root = recursion_root(startDir, !hasParent); + root.add_dir_to_visit(startDir, _T("")); } + pRecursiveOperation->AddRecursionRoot(std::move(root)); CServerPath currentPath; const wxTreeItemId selected = GetSelection(); @@ -1063,7 +1070,7 @@ } CFilterManager filter; - pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, startDir, filter.GetActiveFilters(false), !hasParent, currentPath); + pRecursiveOperation->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filter.GetActiveFilters(false), currentPath); } void CRemoteTreeView::OnMenuRename(wxCommandEvent&) @@ -1318,7 +1325,7 @@ if (path.empty()) continue; - if (filter.FilenameFiltered(GetItemText(child), path.GetPath(), true, -1, false, 0, CDateTime())) { + if (filter.FilenameFiltered(GetItemText(child), path.GetPath(), true, -1, false, 0, fz::datetime())) { wxTreeItemId sel = GetSelection(); while (sel && sel != child) sel = GetItemParent(sel); diff -Nru filezilla-3.14.1/src/interface/resources/16x16/Makefile.in filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.in --- filezilla-3.14.1/src/interface/resources/16x16/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/16x16/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -202,6 +202,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/32x32/Makefile.in filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.in --- filezilla-3.14.1/src/interface/resources/32x32/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/32x32/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -202,6 +202,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/blukis/Makefile.in filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.in --- filezilla-3.14.1/src/interface/resources/blukis/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/blukis/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -206,6 +206,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/cyril/16x16/Makefile.in filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.in --- filezilla-3.14.1/src/interface/resources/cyril/16x16/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/cyril/16x16/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -202,6 +202,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/cyril/Makefile.in filezilla-3.15.0.2/src/interface/resources/cyril/Makefile.in --- filezilla-3.14.1/src/interface/resources/cyril/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/cyril/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -262,6 +262,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/flatzilla/Makefile.in filezilla-3.15.0.2/src/interface/resources/flatzilla/Makefile.in --- filezilla-3.14.1/src/interface/resources/flatzilla/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/flatzilla/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -208,6 +208,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/lone/Makefile.in filezilla-3.15.0.2/src/interface/resources/lone/Makefile.in --- filezilla-3.14.1/src/interface/resources/lone/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/lone/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -206,6 +206,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/MacInfo.plist.in filezilla-3.15.0.2/src/interface/resources/MacInfo.plist.in --- filezilla-3.14.1/src/interface/resources/MacInfo.plist.in 2015-01-03 11:35:55.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/MacInfo.plist.in 2016-02-05 08:54:46.000000000 +0000 @@ -7,7 +7,7 @@ CFBundleExecutable filezilla CFBundleGetInfoString - FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2015 Tim Kosse, Website: https://filezilla-project.org + FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2016 Tim Kosse, Website: https://filezilla-project.org CFBundleIconFile FileZilla.icns CFBundleIdentifier @@ -35,6 +35,6 @@ NSHighResolutionCapable NSHumanReadableCopyright - Copyright (C) 2004-2015 Tim Kosse + Copyright (C) 2004-2016 Tim Kosse diff -Nru filezilla-3.14.1/src/interface/resources/Makefile.in filezilla-3.15.0.2/src/interface/resources/Makefile.in --- filezilla-3.14.1/src/interface/resources/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -275,6 +275,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/minimal/Makefile.in filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.in --- filezilla-3.14.1/src/interface/resources/minimal/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/minimal/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -205,6 +205,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/opencrystal/Makefile.in filezilla-3.15.0.2/src/interface/resources/opencrystal/Makefile.in --- filezilla-3.14.1/src/interface/resources/opencrystal/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/opencrystal/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -209,6 +209,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/sun/Makefile.in filezilla-3.15.0.2/src/interface/resources/sun/Makefile.in --- filezilla-3.14.1/src/interface/resources/sun/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/sun/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -203,6 +203,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/tango/Makefile.in filezilla-3.15.0.2/src/interface/resources/tango/Makefile.in --- filezilla-3.14.1/src/interface/resources/tango/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/tango/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -206,6 +206,8 @@ 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@ diff -Nru filezilla-3.14.1/src/interface/resources/version.rc.in filezilla-3.15.0.2/src/interface/resources/version.rc.in --- filezilla-3.14.1/src/interface/resources/version.rc.in 2015-01-03 11:35:55.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/version.rc.in 2016-02-05 08:54:46.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-2015" + VALUE "LegalCopyright", "Copyright (C) 2006-2016" 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.14.1/src/interface/resources/xrc/dialogs.xrc filezilla-3.15.0.2/src/interface/resources/xrc/dialogs.xrc --- filezilla-3.14.1/src/interface/resources/xrc/dialogs.xrc 2015-09-01 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/xrc/dialogs.xrc 2016-02-05 08:54:46.000000000 +0000 @@ -608,7 +608,7 @@ - + wxTOP|wxBOTTOM 5 @@ -2698,6 +2698,13 @@ wxLEFT|wxRIGHT|wxBOTTOM 5 + + + + + + wxLEFT|wxRIGHT|wxBOTTOM + 5 wxGROW diff -Nru filezilla-3.14.1/src/interface/resources/xrc/settings.xrc filezilla-3.15.0.2/src/interface/resources/xrc/settings.xrc --- filezilla-3.14.1/src/interface/resources/xrc/settings.xrc 2015-08-05 14:40:05.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/resources/xrc/settings.xrc 2016-02-05 08:54:46.000000000 +0000 @@ -1493,7 +1493,7 @@ - + @@ -1542,7 +1542,7 @@ - + diff -Nru filezilla-3.14.1/src/interface/search.cpp filezilla-3.15.0.2/src/interface/search.cpp --- filezilla-3.14.1/src/interface/search.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/search.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -74,7 +74,7 @@ private: virtual bool CanStartComparison() { return false; } virtual void StartComparison() {} - virtual bool GetNextFile(wxString&, bool &, int64_t&, CDateTime&) { return false; } + virtual bool get_next_file(wxString&, bool &, int64_t&, fz::datetime&) { return false; } virtual void CompareAddFile(CComparableListing::t_fileEntryFlags) {} virtual void FinishComparison() {} virtual void ScrollTopItem(int) {} @@ -291,8 +291,8 @@ m_original_dir = m_pState->GetRemotePath(); m_local_target = m_pState->GetLocalDir(); - m_pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER); - m_pState->RegisterHandler(this, STATECHANGE_REMOTE_IDLE); + m_pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR_OTHER, m_pState->GetRecursiveOperationHandler()); + m_pState->RegisterHandler(this, STATECHANGE_REMOTE_IDLE, m_pState->GetRecursiveOperationHandler()); ShowModal(); @@ -315,11 +315,14 @@ } } -void CSearchDialog::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2) +void CSearchDialog::OnStateChange(CState* pState, 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); + auto recursiveOperation = m_pState->GetRecursiveOperationHandler(); + 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()) @@ -369,7 +372,7 @@ } } -void CSearchDialog::OnSearch(wxCommandEvent& event) +void CSearchDialog::OnSearch(wxCommandEvent&) { if (!m_pState->IsRemoteIdle()) { wxBell(); @@ -418,12 +421,14 @@ // Start m_searching = true; - m_pState->GetRecursiveOperationHandler()->AddDirectoryToVisitRestricted(path, _T(""), 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, path, filters, true); + m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(CRecursiveOperation::recursive_list, filters, path); } -void CSearchDialog::OnStop(wxCommandEvent& event) +void CSearchDialog::OnStop(wxCommandEvent&) { if (!m_pState->IsRemoteIdle()) { m_pState->m_pCommandQueue->Cancel(); @@ -452,6 +457,7 @@ if (!m_pState->IsRemoteIdle()) { pMenu->Enable(XRCID("ID_MENU_SEARCH_DOWNLOAD"), false); pMenu->Enable(XRCID("ID_MENU_SEARCH_DELETE"), false); + pMenu->Enable(XRCID("ID_MENU_SEARCH_EDIT"), false); } PopupMenu(pMenu); @@ -500,7 +506,7 @@ EVT_BUTTON(XRCID("wxID_OK"), CSearchDownloadDialog::OnOK) END_EVENT_TABLE() -void CSearchDownloadDialog::OnBrowse(wxCommandEvent& event) +void CSearchDownloadDialog::OnBrowse(wxCommandEvent&) { wxTextCtrl *pText = XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl); @@ -509,7 +515,7 @@ pText->ChangeValue(dlg.GetPath()); } -void CSearchDownloadDialog::OnOK(wxCommandEvent& event) +void CSearchDownloadDialog::OnOK(wxCommandEvent&) { wxTextCtrl *pText = XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl); @@ -527,8 +533,10 @@ EndDialog(wxID_OK); } -void CSearchDialog::ProcessSelection(std::list &selected_files, std::list &selected_dirs) +void CSearchDialog::ProcessSelection(std::list &selected_files, std::deque &selected_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()) @@ -541,49 +549,28 @@ if (path.empty()) continue; - bool replaced = false; - std::list::iterator iter = selected_dirs.begin(); - std::list::iterator prev; - - // Make sure that selected_dirs does not contain - // any directories that are in a parent-child relationship - // Resolve by only keeping topmost parents - while (iter != selected_dirs.end()) { - if (*iter == path) { - replaced = true; - break; - } - - if (iter->IsParentOf(path, false)) { - replaced = true; - break; - } - - if (iter->IsSubdirOf(path, false)) { - if (!replaced) { - *iter = path; - replaced = true; - } - else { - prev = iter++; - selected_dirs.erase(prev); - continue; - } - } - ++iter; - } - if (!replaced) - selected_dirs.push_back(path); + dirs.push_back(path); } 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())) { + continue; + } + selected_dirs.push_back(path); + } + // 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 path = m_results->m_fileData[sel_file].path; - std::list::const_iterator path_iter; + CServerPath const& path = m_results->m_fileData[sel_file].path; + 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)) break; @@ -604,18 +591,13 @@ return; // Find all selected files and directories - std::list selected_dirs; + std::deque selected_dirs; std::list selected_files; ProcessSelection(selected_files, selected_dirs); if (selected_files.empty() && selected_dirs.empty()) return; - if (selected_dirs.size() > 1) { - wxMessageBoxEx(_("Downloading multiple unrelated directories is not yet supported"), _("Downloading search results"), wxICON_EXCLAMATION); - return; - } - CSearchDownloadDialog dlg; if (!dlg.Run(this, m_local_target.GetPath(), selected_files.size(), selected_dirs.size())) return; @@ -677,10 +659,12 @@ if (!flatten && dir.HasParent()) target_path.AddSegment(dir.GetLastSegment()); - m_pState->GetRecursiveOperationHandler()->AddDirectoryToVisit(dir, _T(""), target_path, false); - std::vector const filters; // Empty, recurse into everything - m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(mode, dir, filters, true, m_original_dir); + recursion_root root(dir, true); + root.add_dir_to_visit(dir, _T(""), target_path, false); + m_pState->GetRecursiveOperationHandler()->AddRecursionRoot(std::move(root)); } + std::vector const filters; // Empty, recurse into everything + m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(mode, filters, m_original_dir); } void CSearchDialog::OnEdit(wxCommandEvent&) @@ -689,7 +673,7 @@ return; // Find all selected files and directories - std::list selected_dirs; + std::deque selected_dirs; std::list selected_files; ProcessSelection(selected_files, selected_dirs); @@ -742,18 +726,13 @@ return; // Find all selected files and directories - std::list selected_dirs; + std::deque selected_dirs; std::list selected_files; ProcessSelection(selected_files, selected_dirs); if (selected_files.empty() && selected_dirs.empty()) return; - if (selected_dirs.size() > 1) { - wxMessageBoxEx(_("Deleting multiple unrelated directories is not yet supported"), _("Deleting directories"), wxICON_EXCLAMATION); - 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()); @@ -776,16 +755,17 @@ } for (auto path : selected_dirs) { - if (!path.HasParent()) - m_pState->GetRecursiveOperationHandler()->AddDirectoryToVisit(path, _T("")); - else { - m_pState->GetRecursiveOperationHandler()->AddDirectoryToVisit(path.GetParent(), path.GetLastSegment()); + wxString segment; + if (path.HasParent()) { + segment = path.GetLastSegment(); path = path.GetParent(); } - - std::vector const filters; // Empty, recurse into everything - m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(CRecursiveOperation::recursive_delete, path, filters, !path.HasParent(), m_original_dir); + recursion_root root(path, !path.HasParent()); + root.add_dir_to_visit(path, segment); + m_pState->GetRecursiveOperationHandler()->AddRecursionRoot(std::move(root)); } + std::vector const filters; // Empty, recurse into everything + m_pState->GetRecursiveOperationHandler()->StartRecursiveOperation(CRecursiveOperation::recursive_delete, filters, m_original_dir); } void CSearchDialog::OnCharHook(wxKeyEvent& event) diff -Nru filezilla-3.14.1/src/interface/search.h filezilla-3.15.0.2/src/interface/search.h --- filezilla-3.14.1/src/interface/search.h 2015-06-18 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/search.h 2016-02-05 08:54:46.000000000 +0000 @@ -42,7 +42,7 @@ CServerPath m_original_dir; CLocalPath m_local_target; - void ProcessSelection(std::list &selected_files, std::list &selected_dirs); + void ProcessSelection(std::list &selected_files, std::deque &selected_dirs); DECLARE_EVENT_TABLE() void OnSearch(wxCommandEvent& event); diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_connection_active.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_connection_active.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_connection_active.cpp 2014-05-01 19:29:21.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_connection_active.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -4,6 +4,8 @@ #include "optionspage.h" #include "optionspage_connection_active.h" +#include + BEGIN_EVENT_TABLE(COptionsPageConnectionActive, COptionsPage) EVT_CHECKBOX(XRCID("ID_LIMITPORTS"), COptionsPageConnectionActive::OnRadioOrCheckEvent) EVT_RADIOBUTTON(XRCID("ID_ACTIVEMODE1"), COptionsPageConnectionActive::OnRadioOrCheckEvent) @@ -82,11 +84,12 @@ else mode = GetRCheck(XRCID("ID_ACTIVEMODE2")) ? 1 : 2; - if (mode == 1) - { + if (mode == 1) { wxTextCtrl* pActiveIP = XRCCTRL(*this, "ID_ACTIVEIP", wxTextCtrl); - if (!IsIpAddress(pActiveIP->GetValue())) - return DisplayError(pActiveIP, _("You have to enter a valid IP address.")); + wxString const ip = pActiveIP->GetValue(); + if (fz::get_address_type(ip.ToStdWstring()) != fz::address_type::ipv4) { + return DisplayError(pActiveIP, _("You have to enter a valid IPv4 address.")); + } } return true; @@ -108,7 +111,7 @@ FindWindow(XRCID("ID_NOEXTERNALONLOCAL"))->Enable(mode != 0); } -void COptionsPageConnectionActive::OnRadioOrCheckEvent(wxCommandEvent& event) +void COptionsPageConnectionActive::OnRadioOrCheckEvent(wxCommandEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_connection.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_connection.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_connection.cpp 2015-03-16 04:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_connection.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -48,7 +48,7 @@ return true; } -void COptionsPageConnection::OnWizard(wxCommandEvent& event) +void COptionsPageConnection::OnWizard(wxCommandEvent&) { CNetConfWizard wizard(GetParent(), m_pOptions, m_pOwner->GetEngineContext()); if (!wizard.Load()) diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_connection_sftp.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_connection_sftp.cpp 2015-08-05 14:40:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_connection_sftp.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -75,7 +75,7 @@ return true; } -void COptionsPageConnectionSFTP::OnAdd(wxCommandEvent& event) +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) @@ -86,7 +86,7 @@ AddKey(dlg.GetPath(), false); } -void COptionsPageConnectionSFTP::OnRemove(wxCommandEvent& event) +void COptionsPageConnectionSFTP::OnRemove(wxCommandEvent&) { wxListCtrl* pKeys = XRCCTRL(*this, "ID_KEYS", wxListCtrl); @@ -136,12 +136,12 @@ return; } -void COptionsPageConnectionSFTP::OnSelChanged(wxListEvent& event) +void COptionsPageConnectionSFTP::OnSelChanged(wxListEvent&) { SetCtrlState(); } -void COptionsPageConnectionSFTP::OnEndProcess(wxProcessEvent& event) +void COptionsPageConnectionSFTP::OnEndProcess(wxProcessEvent&) { m_pFzpg->DeleteProcess(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_dateformatting.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_dateformatting.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_dateformatting.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -71,7 +71,7 @@ if (dateformat.empty()) { return DisplayError(_T("ID_CUSTOM_DATEFORMAT"), _("Please enter a custom date format.")); } - if (!CDateTime::VerifyFormat(dateformat)) { + if (!fz::datetime::verify_format(dateformat.ToStdWstring())) { return DisplayError(_T("ID_CUSTOM_DATEFORMAT"), _("The custom date format is invalid or contains unsupported format specifiers.")); } } @@ -81,7 +81,7 @@ if (timeformat.empty()) { return DisplayError(_T("ID_CUSTOM_TIMEFORMAT"), _("Please enter a custom time format.")); } - if (!CDateTime::VerifyFormat(timeformat)) { + if (!fz::datetime::verify_format(timeformat.ToStdWstring())) { return DisplayError(_T("ID_CUSTOM_TIMEFORMAT"), _("The custom time format is invalid or contains unsupported format specifiers.")); } } @@ -89,7 +89,7 @@ return true; } -void COptionsPageDateFormatting::OnRadioChanged(wxCommandEvent& event) +void COptionsPageDateFormatting::OnRadioChanged(wxCommandEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_edit.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_edit.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_edit.cpp 2014-06-19 15:14:23.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_edit.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -99,7 +99,7 @@ return true; } -void COptionsPageEdit::OnBrowseEditor(wxCommandEvent& event) +void COptionsPageEdit::OnBrowseEditor(wxCommandEvent&) { wxFileDialog dlg(this, _("Select default editor"), wxString(), wxString(), #ifdef __WXMSW__ @@ -142,7 +142,7 @@ XRCCTRL(*this, "ID_USEDEFAULT", wxRadioButton)->Enable(!GetRCheck(XRCID("ID_DEFAULT_NONE")) || GetRCheck(XRCID("ID_USEDEFAULT"))); } -void COptionsPageEdit::OnRadioButton(wxCommandEvent& event) +void COptionsPageEdit::OnRadioButton(wxCommandEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_filetype.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_filetype.cpp 2014-07-15 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_filetype.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -119,7 +119,7 @@ FindWindow(XRCID("ID_ADD"))->Enable( !GetText(XRCID("ID_EXTENSION")).empty() ); } -void COptionsPageFiletype::OnRemove(wxCommandEvent& event) +void COptionsPageFiletype::OnRemove(wxCommandEvent&) { wxListCtrl* pListCtrl = XRCCTRL(*this, "ID_EXTENSIONS", wxListCtrl); wxASSERT(pListCtrl); @@ -134,11 +134,10 @@ SetCtrlState(); } -void COptionsPageFiletype::OnAdd(wxCommandEvent& event) +void COptionsPageFiletype::OnAdd(wxCommandEvent&) { wxString ext = GetText(XRCID("ID_EXTENSION")); - if (ext.empty()) - { + if (ext.empty()) { wxBell(); return; } @@ -161,12 +160,12 @@ SetCtrlState(); } -void COptionsPageFiletype::OnTextChanged(wxCommandEvent& event) +void COptionsPageFiletype::OnTextChanged(wxCommandEvent&) { SetCtrlState(); } -void COptionsPageFiletype::OnSelChanged(wxListEvent& event) +void COptionsPageFiletype::OnSelChanged(wxListEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_ftpproxy.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_ftpproxy.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_ftpproxy.cpp 2014-06-19 15:14:23.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_ftpproxy.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -143,12 +143,12 @@ pTextCtrl->ChangeValue(loginSequence); } -void COptionsPageFtpProxy::OnProxyTypeChanged(wxCommandEvent& event) +void COptionsPageFtpProxy::OnProxyTypeChanged(wxCommandEvent&) { SetCtrlState(); } -void COptionsPageFtpProxy::OnLoginSequenceChanged(wxCommandEvent& event) +void COptionsPageFtpProxy::OnLoginSequenceChanged(wxCommandEvent&) { XRCCTRL(*this, "ID_PROXYTYPE_CUSTOM", wxRadioButton)->SetValue(true); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_interface.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_interface.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_interface.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_interface.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -95,7 +95,7 @@ return true; } -void COptionsPageInterface::OnLayoutChange(wxCommandEvent& event) +void COptionsPageInterface::OnLayoutChange(wxCommandEvent&) { m_pOptions->SetOption(OPTION_FILEPANE_LAYOUT, GetChoice(XRCID("ID_FILEPANELAYOUT"))); m_pOptions->SetOption(OPTION_FILEPANE_SWAP, GetCheck(XRCID("ID_FILEPANESWAP")) ? 1 : 0); diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_logging.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_logging.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_logging.cpp 2014-06-19 15:14:23.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_logging.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -92,7 +92,7 @@ XRCCTRL(*this, "ID_LIMIT", wxTextCtrl)->Enable(log_to_file && limit); } -void COptionsPageLogging::OnBrowse(wxCommandEvent& event) +void COptionsPageLogging::OnBrowse(wxCommandEvent&) { wxFileDialog dlg(this, _("Log file"), wxString(), _T("filezilla.log"), _T("Log files (*.log)|*.log"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); @@ -102,7 +102,7 @@ XRCCTRL(*this, "ID_FILENAME", wxTextCtrl)->ChangeValue(dlg.GetPath()); } -void COptionsPageLogging::OnCheck(wxCommandEvent& event) +void COptionsPageLogging::OnCheck(wxCommandEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_proxy.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_proxy.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_proxy.cpp 2014-06-19 15:14:23.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_proxy.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -101,7 +101,7 @@ XRCCTRL(*this, "ID_PROXY_PASS", wxTextCtrl)->Enable(enabled && enabled_auth); } -void COptionsPageProxy::OnProxyTypeChanged(wxCommandEvent& event) +void COptionsPageProxy::OnProxyTypeChanged(wxCommandEvent&) { SetCtrlState(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_sizeformatting.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_sizeformatting.cpp 2015-08-05 14:40:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_sizeformatting.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -70,18 +70,18 @@ return true; } -void COptionsPageSizeFormatting::OnRadio(wxCommandEvent& event) +void COptionsPageSizeFormatting::OnRadio(wxCommandEvent&) { UpdateControls(); UpdateExamples(); } -void COptionsPageSizeFormatting::OnCheck(wxCommandEvent& event) +void COptionsPageSizeFormatting::OnCheck(wxCommandEvent&) { UpdateExamples(); } -void COptionsPageSizeFormatting::OnSpin(wxSpinEvent& event) +void COptionsPageSizeFormatting::OnSpin(wxSpinEvent&) { UpdateExamples(); } diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_themes.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_themes.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_themes.cpp 2014-06-19 15:14:23.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_themes.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -73,7 +73,7 @@ protected: DECLARE_EVENT_TABLE() - virtual void OnPaint(wxPaintEvent& event) + virtual void OnPaint(wxPaintEvent&) { CalcSize(); @@ -216,7 +216,7 @@ return !failure; } -void COptionsPageThemes::OnThemeChange(wxCommandEvent& event) +void COptionsPageThemes::OnThemeChange(wxCommandEvent&) { wxChoice* pTheme = XRCCTRL(*this, "ID_THEME", wxChoice); diff -Nru filezilla-3.14.1/src/interface/settings/optionspage_transfer.cpp filezilla-3.15.0.2/src/interface/settings/optionspage_transfer.cpp --- filezilla-3.14.1/src/interface/settings/optionspage_transfer.cpp 2014-11-29 04:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/optionspage_transfer.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -9,7 +9,7 @@ EVT_CHECKBOX(XRCID("ID_ENABLE_SPEEDLIMITS"), COptionsPageTransfer::OnToggleSpeedLimitEnable) END_EVENT_TABLE() -void COptionsPageTransfer::OnToggleSpeedLimitEnable(wxCommandEvent& event) +void COptionsPageTransfer::OnToggleSpeedLimitEnable(wxCommandEvent&) { bool enable_speedlimits = GetCheck(XRCID("ID_ENABLE_SPEEDLIMITS")); XRCCTRL(*this, "ID_DOWNLOADLIMIT", wxTextCtrl)->Enable(enable_speedlimits); diff -Nru filezilla-3.14.1/src/interface/settings/settingsdialog.cpp filezilla-3.15.0.2/src/interface/settings/settingsdialog.cpp --- filezilla-3.14.1/src/interface/settings/settingsdialog.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/settings/settingsdialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -228,7 +228,7 @@ } } -void CSettingsDialog::OnOK(wxCommandEvent& event) +void CSettingsDialog::OnOK(wxCommandEvent&) { for( auto const& page : m_pages ) { if (!page.page->Validate()) { @@ -247,7 +247,7 @@ EndModal(wxID_OK); } -void CSettingsDialog::OnCancel(wxCommandEvent& event) +void CSettingsDialog::OnCancel(wxCommandEvent&) { EndModal(wxID_CANCEL); diff -Nru filezilla-3.14.1/src/interface/sitemanager.cpp filezilla-3.15.0.2/src/interface/sitemanager.cpp --- filezilla-3.14.1/src/interface/sitemanager.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/sitemanager.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -164,7 +164,7 @@ return true; } - virtual bool AddBookmark(const wxString& name, std::unique_ptr data) + virtual bool AddBookmark(const wxString&, std::unique_ptr) { return true; } @@ -221,19 +221,19 @@ class CSiteManagerXmlHandler_Stats : public CSiteManagerXmlHandler { public: - virtual bool AddFolder(const wxString& name, bool) + virtual bool AddFolder(const wxString&, bool) { ++directories_; return true; } - virtual bool AddSite(std::unique_ptr data) + virtual bool AddSite(std::unique_ptr) { ++sites_; return true; } - virtual bool AddBookmark(const wxString& name, std::unique_ptr data) + virtual bool AddBookmark(const wxString&, std::unique_ptr) { ++bookmarks_; return true; diff -Nru filezilla-3.14.1/src/interface/sitemanager_dialog.cpp filezilla-3.15.0.2/src/interface/sitemanager_dialog.cpp --- filezilla-3.14.1/src/interface/sitemanager_dialog.cpp 2015-08-21 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/sitemanager_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -906,7 +906,7 @@ return true; } -void CSiteManagerDialog::OnNewFolder(wxCommandEvent&event) +void CSiteManagerDialog::OnNewFolder(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); if (!pTree) @@ -1058,7 +1058,7 @@ // In key file logon type, check that the provided key file exists wxString keyFile, keyFileComment, keyFileData; if (logon_type == KEY) { - keyFile = XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->GetValue(); + keyFile = xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue); 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); @@ -1068,7 +1068,7 @@ // 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)) - XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->ChangeValue(keyFile); + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, keyFile); else { xrc_call(*this, "ID_KEYFILE", &wxWindow::SetFocus); return false; @@ -1204,7 +1204,7 @@ pTree->SortChildren(parent); } -void CSiteManagerDialog::OnRename(wxCommandEvent& event) +void CSiteManagerDialog::OnRename(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) @@ -1217,7 +1217,7 @@ pTree->EditLabel(item); } -void CSiteManagerDialog::OnDelete(wxCommandEvent& event) +void CSiteManagerDialog::OnDelete(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); if (!pTree) @@ -1264,12 +1264,12 @@ UpdateItem(); } -void CSiteManagerDialog::OnSelChanged(wxTreeEvent& event) +void CSiteManagerDialog::OnSelChanged(wxTreeEvent&) { SetCtrlState(); } -void CSiteManagerDialog::OnNewSite(wxCommandEvent& event) +void CSiteManagerDialog::OnNewSite(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) @@ -1305,11 +1305,11 @@ SetControlVisibility(GetProtocol(), GetLogonType()); - XRCCTRL(*this, "ID_USER", wxTextCtrl)->Enable(event.GetString() != _("Anonymous")); - XRCCTRL(*this, "ID_PASS", wxTextCtrl)->Enable(event.GetString() == _("Normal") || event.GetString() == _("Account")); - XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->Enable(event.GetString() == _("Account")); - XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->Enable(event.GetString() == _("Key file")); - XRCCTRL(*this, "ID_KEYFILE_BROWSE", wxButton)->Enable(event.GetString() == _("Key file")); + 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")); } bool CSiteManagerDialog::UpdateItem() @@ -1378,7 +1378,7 @@ xrc_call(*this, "ID_PASS", &wxTextCtrl::GetValue)); server.m_server.SetAccount(xrc_call(*this, "ID_ACCOUNT", &wxTextCtrl::GetValue)); - server.m_server.SetKeyFile(XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->GetValue()); + server.m_server.SetKeyFile(xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::GetValue)); server.m_comments = xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::GetValue); @@ -1465,7 +1465,7 @@ return true; } -void CSiteManagerDialog::OnKeyFileBrowse(wxCommandEvent& event) +void CSiteManagerDialog::OnKeyFileBrowse(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) @@ -1497,7 +1497,7 @@ } } } -void CSiteManagerDialog::OnRemoteDirBrowse(wxCommandEvent& event) +void CSiteManagerDialog::OnRemoteDirBrowse(wxCommandEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) @@ -1517,7 +1517,7 @@ } } -void CSiteManagerDialog::OnItemActivated(wxTreeEvent& event) +void CSiteManagerDialog::OnItemActivated(wxTreeEvent&) { wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl); if (!pTree) @@ -1565,44 +1565,44 @@ // Set the control states according if it's possible to use the control const bool root_or_predefined = (item == pTree->GetRootItem() || item == m_ownSites || predefined); - XRCCTRL(*this, "ID_RENAME", wxWindow)->Enable(!root_or_predefined); - XRCCTRL(*this, "ID_DELETE", wxWindow)->Enable(!root_or_predefined); - XRCCTRL(*this, "ID_COPY", wxWindow)->Enable(false); + xrc_call(*this, "ID_RENAME", &wxWindow::Enable, !root_or_predefined); + xrc_call(*this, "ID_DELETE", &wxWindow::Enable, !root_or_predefined); + xrc_call(*this, "ID_COPY", &wxWindow::Enable, false); m_pNotebook_Site->Enable(false); - XRCCTRL(*this, "ID_NEWFOLDER", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWSITE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWBOOKMARK", wxWindow)->Enable(false); - XRCCTRL(*this, "ID_CONNECT", wxButton)->Enable(false); + xrc_call(*this, "ID_NEWFOLDER", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_NEWSITE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_NEWBOOKMARK", &wxWindow::Enable, false); + xrc_call(*this, "ID_CONNECT", &wxButton::Enable, false); // Empty all site information - XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString()); + xrc_call(*this, "ID_HOST", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString()); SetProtocol(FTP); - XRCCTRL(*this, "ID_BYPASSPROXY", wxCheckBox)->SetValue(false); - XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(_("Anonymous")); - XRCCTRL(*this, "ID_USER", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_PASS", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_COMMENTS", wxTextCtrl)->ChangeValue(wxString()); + xrc_call(*this, "ID_BYPASSPROXY", &wxCheckBox::SetValue, false); + 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_ACCOUNT", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_COMMENTS", &wxTextCtrl::ChangeValue, wxString()); SetControlVisibility(FTP, ANONYMOUS); - XRCCTRL(*this, "ID_SERVERTYPE", wxChoice)->SetSelection(0); - XRCCTRL(*this, "ID_LOCALDIR", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_REMOTEDIR", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_SYNC", wxCheckBox)->SetValue(false); - XRCCTRL(*this, "ID_TIMEZONE_HOURS", wxSpinCtrl)->SetValue(0); - XRCCTRL(*this, "ID_TIMEZONE_MINUTES", wxSpinCtrl)->SetValue(0); - - XRCCTRL(*this, "ID_TRANSFERMODE_DEFAULT", wxRadioButton)->SetValue(true); - XRCCTRL(*this, "ID_LIMITMULTIPLE", wxCheckBox)->SetValue(false); - XRCCTRL(*this, "ID_MAXMULTIPLE", wxSpinCtrl)->SetValue(1); + xrc_call(*this, "ID_SERVERTYPE", &wxChoice::SetSelection, 0); + xrc_call(*this, "ID_LOCALDIR", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_SYNC", &wxCheckBox::SetValue, false); + xrc_call(*this, "ID_TIMEZONE_HOURS", &wxSpinCtrl::SetValue, 0); + xrc_call(*this, "ID_TIMEZONE_MINUTES", &wxSpinCtrl::SetValue, 0); + + xrc_call(*this, "ID_TRANSFERMODE_DEFAULT", &wxRadioButton::SetValue, true); + xrc_call(*this, "ID_LIMITMULTIPLE", &wxCheckBox::SetValue, false); + xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::SetValue, 1); - XRCCTRL(*this, "ID_CHARSET_AUTO", wxRadioButton)->SetValue(true); - XRCCTRL(*this, "ID_ENCODING", wxTextCtrl)->ChangeValue(wxString()); + xrc_call(*this, "ID_CHARSET_AUTO", &wxRadioButton::SetValue, true); + xrc_call(*this, "ID_ENCODING", &wxTextCtrl::ChangeValue, wxString()); #ifdef __WXGTK__ - XRCCTRL(*this, "wxID_OK", wxButton)->SetDefault(); + xrc_call(*this, "wxID_OK", &wxButton::SetDefault); #endif } else if (data->m_type == CSiteManagerItemData::SITE) { @@ -1613,105 +1613,105 @@ CSiteManagerItemData_Site* site_data = (CSiteManagerItemData_Site *)data; // Set the control states according if it's possible to use the control - XRCCTRL(*this, "ID_RENAME", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_DELETE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_COPY", wxWindow)->Enable(true); + xrc_call(*this, "ID_RENAME", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_DELETE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_COPY", &wxWindow::Enable, true); m_pNotebook_Site->Enable(true); - XRCCTRL(*this, "ID_NEWFOLDER", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWSITE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWBOOKMARK", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_CONNECT", wxButton)->Enable(true); + xrc_call(*this, "ID_NEWFOLDER", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_NEWSITE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_NEWBOOKMARK", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_CONNECT", &wxButton::Enable, true); - XRCCTRL(*this, "ID_HOST", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_HOST", wxTextCtrl)->ChangeValue(site_data->m_server.FormatHost(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(); if (port != CServer::GetDefaultPort(site_data->m_server.GetProtocol())) - XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString::Format(_T("%d"), port)); + xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString::Format(_T("%d"), port)); else - XRCCTRL(*this, "ID_PORT", wxTextCtrl)->ChangeValue(wxString()); - XRCCTRL(*this, "ID_PORT", wxWindow)->Enable(!predefined); + xrc_call(*this, "ID_PORT", &wxTextCtrl::ChangeValue, wxString()); + xrc_call(*this, "ID_PORT", &wxWindow::Enable, !predefined); SetProtocol(site_data->m_server.GetProtocol()); - XRCCTRL(*this, "ID_PROTOCOL", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_ENCRYPTION", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_BYPASSPROXY", wxCheckBox)->SetValue(site_data->m_server.GetBypassProxy()); - - XRCCTRL(*this, "ID_USER", wxTextCtrl)->Enable(!predefined && site_data->m_server.GetLogonType() != ANONYMOUS); - XRCCTRL(*this, "ID_PASS", wxTextCtrl)->Enable(!predefined && (site_data->m_server.GetLogonType() == NORMAL || site_data->m_server.GetLogonType() == ACCOUNT)); - XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->Enable(!predefined && site_data->m_server.GetLogonType() == ACCOUNT); - XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->Enable(!predefined && site_data->m_server.GetLogonType() == KEY); - XRCCTRL(*this, "ID_KEYFILE_BROWSE", wxButton)->Enable(!predefined && site_data->m_server.GetLogonType() == KEY); + 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_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); SetControlVisibility(site_data->m_server.GetProtocol(), site_data->m_server.GetLogonType()); - XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(CServer::GetNameFromLogonType(site_data->m_server.GetLogonType())); - XRCCTRL(*this, "ID_LOGONTYPE", wxWindow)->Enable(!predefined); + xrc_call(*this, "ID_LOGONTYPE", &wxChoice::SetStringSelection, CServer::GetNameFromLogonType(site_data->m_server.GetLogonType())); + xrc_call(*this, "ID_LOGONTYPE", &wxWindow::Enable, !predefined); - XRCCTRL(*this, "ID_USER", wxTextCtrl)->ChangeValue(site_data->m_server.GetUser()); - XRCCTRL(*this, "ID_ACCOUNT", wxTextCtrl)->ChangeValue(site_data->m_server.GetAccount()); - XRCCTRL(*this, "ID_PASS", wxTextCtrl)->ChangeValue(site_data->m_server.GetPass()); - XRCCTRL(*this, "ID_KEYFILE", wxTextCtrl)->ChangeValue(site_data->m_server.GetKeyFile()); - XRCCTRL(*this, "ID_COMMENTS", wxTextCtrl)->ChangeValue(site_data->m_comments); - XRCCTRL(*this, "ID_COMMENTS", wxWindow)->Enable(!predefined); - - XRCCTRL(*this, "ID_SERVERTYPE", wxChoice)->SetSelection(site_data->m_server.GetType()); - XRCCTRL(*this, "ID_SERVERTYPE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_LOCALDIR", wxTextCtrl)->ChangeValue(site_data->m_localDir); - XRCCTRL(*this, "ID_LOCALDIR", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_REMOTEDIR", wxTextCtrl)->ChangeValue(site_data->m_remoteDir.GetPath()); - XRCCTRL(*this, "ID_REMOTEDIR", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_SYNC", wxCheckBox)->Enable(!predefined); - XRCCTRL(*this, "ID_SYNC", wxCheckBox)->SetValue(site_data->m_sync); - XRCCTRL(*this, "ID_COMPARISON", wxCheckBox)->Enable(!predefined); - XRCCTRL(*this, "ID_COMPARISON", wxCheckBox)->SetValue(site_data->m_comparison); - XRCCTRL(*this, "ID_TIMEZONE_HOURS", wxSpinCtrl)->SetValue(site_data->m_server.GetTimezoneOffset() / 60); - XRCCTRL(*this, "ID_TIMEZONE_HOURS", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_TIMEZONE_MINUTES", wxSpinCtrl)->SetValue(site_data->m_server.GetTimezoneOffset() % 60); - XRCCTRL(*this, "ID_TIMEZONE_MINUTES", 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_COMMENTS", &wxWindow::Enable, !predefined); + + xrc_call(*this, "ID_SERVERTYPE", &wxChoice::SetSelection, site_data->m_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", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_REMOTEDIR", &wxTextCtrl::ChangeValue, site_data->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_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_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", &wxWindow::Enable, !predefined); enum PasvMode pasvMode = site_data->m_server.GetPasvMode(); if (pasvMode == MODE_ACTIVE) - XRCCTRL(*this, "ID_TRANSFERMODE_ACTIVE", wxRadioButton)->SetValue(true); + xrc_call(*this, "ID_TRANSFERMODE_ACTIVE", &wxRadioButton::SetValue, true); else if (pasvMode == MODE_PASSIVE) - XRCCTRL(*this, "ID_TRANSFERMODE_PASSIVE", wxRadioButton)->SetValue(true); + xrc_call(*this, "ID_TRANSFERMODE_PASSIVE", &wxRadioButton::SetValue, true); else - XRCCTRL(*this, "ID_TRANSFERMODE_DEFAULT", wxRadioButton)->SetValue(true); - XRCCTRL(*this, "ID_TRANSFERMODE_ACTIVE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_TRANSFERMODE_PASSIVE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_TRANSFERMODE_DEFAULT", wxWindow)->Enable(!predefined); + 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(); - XRCCTRL(*this, "ID_LIMITMULTIPLE", wxCheckBox)->SetValue(maxMultiple != 0); - XRCCTRL(*this, "ID_LIMITMULTIPLE", wxWindow)->Enable(!predefined); + xrc_call(*this, "ID_LIMITMULTIPLE", &wxCheckBox::SetValue, maxMultiple != 0); + xrc_call(*this, "ID_LIMITMULTIPLE", &wxWindow::Enable, !predefined); if (maxMultiple != 0) { - XRCCTRL(*this, "ID_MAXMULTIPLE", wxSpinCtrl)->Enable(!predefined); - XRCCTRL(*this, "ID_MAXMULTIPLE", wxSpinCtrl)->SetValue(maxMultiple); + xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::Enable, !predefined); + xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::SetValue, maxMultiple); } else { - XRCCTRL(*this, "ID_MAXMULTIPLE", wxSpinCtrl)->Enable(false); - XRCCTRL(*this, "ID_MAXMULTIPLE", wxSpinCtrl)->SetValue(1); + xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::Enable, false); + xrc_call(*this, "ID_MAXMULTIPLE", &wxSpinCtrl::SetValue, 1); } switch (site_data->m_server.GetEncodingType()) { default: case ENCODING_AUTO: - XRCCTRL(*this, "ID_CHARSET_AUTO", wxRadioButton)->SetValue(true); + xrc_call(*this, "ID_CHARSET_AUTO", &wxRadioButton::SetValue, true); break; case ENCODING_UTF8: - XRCCTRL(*this, "ID_CHARSET_UTF8", wxRadioButton)->SetValue(true); + xrc_call(*this, "ID_CHARSET_UTF8", &wxRadioButton::SetValue, true); break; case ENCODING_CUSTOM: - XRCCTRL(*this, "ID_CHARSET_CUSTOM", wxRadioButton)->SetValue(true); + xrc_call(*this, "ID_CHARSET_CUSTOM", &wxRadioButton::SetValue, true); break; } - XRCCTRL(*this, "ID_CHARSET_AUTO", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_CHARSET_UTF8", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_CHARSET_CUSTOM", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_ENCODING", wxTextCtrl)->Enable(!predefined && site_data->m_server.GetEncodingType() == ENCODING_CUSTOM); - XRCCTRL(*this, "ID_ENCODING", wxTextCtrl)->ChangeValue(site_data->m_server.GetCustomEncoding()); + 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()); #ifdef __WXGTK__ - XRCCTRL(*this, "ID_CONNECT", wxButton)->SetDefault(); + xrc_call(*this, "ID_CONNECT", &wxButton::SetDefault); #endif } else { @@ -1720,29 +1720,29 @@ m_pNotebook_Site->GetContainingSizer()->Layout(); // Set the control states according if it's possible to use the control - XRCCTRL(*this, "ID_RENAME", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_DELETE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_COPY", wxWindow)->Enable(true); - XRCCTRL(*this, "ID_NEWFOLDER", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWSITE", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_NEWBOOKMARK", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_CONNECT", wxButton)->Enable(true); - - XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->ChangeValue(data->m_localDir); - XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxWindow)->Enable(!predefined); - XRCCTRL(*this, "ID_BOOKMARK_REMOTEDIR", wxTextCtrl)->ChangeValue(data->m_remoteDir.GetPath()); - XRCCTRL(*this, "ID_BOOKMARK_REMOTEDIR", wxWindow)->Enable(!predefined); - - XRCCTRL(*this, "ID_BOOKMARK_SYNC", wxCheckBox)->Enable(!predefined); - XRCCTRL(*this, "ID_BOOKMARK_SYNC", wxCheckBox)->SetValue(data->m_sync); - XRCCTRL(*this, "ID_BOOKMARK_COMPARISON", wxCheckBox)->Enable(!predefined); - XRCCTRL(*this, "ID_BOOKMARK_COMPARISON", wxCheckBox)->SetValue(data->m_comparison); + xrc_call(*this, "ID_RENAME", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_DELETE", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_COPY", &wxWindow::Enable, true); + xrc_call(*this, "ID_NEWFOLDER", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_NEWSITE", &wxWindow::Enable, !predefined); + 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", &wxWindow::Enable, !predefined); + xrc_call(*this, "ID_BOOKMARK_REMOTEDIR", &wxTextCtrl::ChangeValue, data->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_COMPARISON", &wxCheckBox::Enable, !predefined); + xrc_call(*this, "ID_BOOKMARK_COMPARISON", &wxCheckBox::SetValue, data->m_comparison); } #ifdef __WXGTK__ if (pFocus && !pFocus->IsEnabled()) { for (wxWindow* pParent = pFocus->GetParent(); pParent; pParent = pParent->GetParent()) { if (pParent == this) { - XRCCTRL(*this, "wxID_OK", wxButton)->SetFocus(); + xrc_call(*this, "wxID_OK", &wxButton::SetFocus); break; } } @@ -1750,13 +1750,13 @@ #endif } -void CSiteManagerDialog::OnCharsetChange(wxCommandEvent& event) +void CSiteManagerDialog::OnCharsetChange(wxCommandEvent&) { - bool checked = XRCCTRL(*this, "ID_CHARSET_CUSTOM", wxRadioButton)->GetValue(); - XRCCTRL(*this, "ID_ENCODING", wxTextCtrl)->Enable(checked); + bool checked = xrc_call(*this, "ID_CHARSET_CUSTOM", &wxRadioButton::GetValue); + xrc_call(*this, "ID_ENCODING", &wxTextCtrl::Enable, checked); } -void CSiteManagerDialog::OnProtocolSelChanged(wxCommandEvent& event) +void CSiteManagerDialog::OnProtocolSelChanged(wxCommandEvent&) { SetControlVisibility(GetProtocol(), GetLogonType()); } @@ -1795,11 +1795,14 @@ xrc_call(*this, "ID_KEYFILE", &wxTextCtrl::Show, protocol == SFTP && type == KEY); xrc_call(*this, "ID_KEYFILE_BROWSE", &wxButton::Show, protocol == SFTP && type == KEY); - xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::GetContainingSizer)->CalcMin(); - xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::GetContainingSizer)->Layout(); + auto keyfileSizer = xrc_call(*this, "ID_KEYFILE_DESC", &wxStaticText::GetContainingSizer); + if (keyfileSizer) { + keyfileSizer->CalcMin(); + keyfileSizer->Layout(); + } } -void CSiteManagerDialog::OnCopySite(wxCommandEvent& event) +void CSiteManagerDialog::OnCopySite(wxCommandEvent&) { wxTreeCtrlEx *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrlEx); if (!pTree) diff -Nru filezilla-3.14.1/src/interface/speedlimits_dialog.cpp filezilla-3.15.0.2/src/interface/speedlimits_dialog.cpp --- filezilla-3.14.1/src/interface/speedlimits_dialog.cpp 2014-07-15 03:30:02.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/speedlimits_dialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -44,7 +44,7 @@ ShowModal(); } -void CSpeedLimitsDialog::OnOK(wxCommandEvent& event) +void CSpeedLimitsDialog::OnOK(wxCommandEvent&) { long download, upload; wxTextCtrl* pCtrl = XRCCTRL(*this, "ID_DOWNLOADLIMIT", wxTextCtrl); diff -Nru filezilla-3.14.1/src/interface/state.cpp filezilla-3.15.0.2/src/interface/state.cpp --- filezilla-3.14.1/src/interface/state.cpp 2015-09-04 11:41:18.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/state.cpp 2016-02-10 19:27:09.000000000 +0000 @@ -7,10 +7,11 @@ #include "queue.h" #include "filezillaapp.h" #include "recursive_operation.h" -#include "local_filesys.h" #include "listingcomparison.h" #include "xrc_helper.h" +#include + CContextManager CContextManager::m_the_context_manager; CContextManager::CContextManager() @@ -553,24 +554,32 @@ m_pEngine = 0; } -void CState::RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification) +void CState::RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, CStateEventHandler* insertBefore) { wxASSERT(pHandler); wxASSERT(pHandler->m_pState == this); if (pHandler->m_pState != this) return; wxASSERT(notification != STATECHANGE_MAX && notification != STATECHANGE_NONE); + wxASSERT(pHandler != insertBefore); + auto &handlers = m_handlers[notification]; - for (auto const& it : handlers) { - if (it.pHandler == pHandler) { + auto insertionPoint = handlers.end(); + + for (auto it = handlers.begin(); it != handlers.end(); ++it) { + if (it->pHandler == insertBefore) { + insertionPoint = it; + } + if (it->pHandler == pHandler) { + wxASSERT(insertionPoint == handlers.end()); return; } } t_handler handler; handler.pHandler = pHandler; - handlers.push_back(handler); + handlers.insert(insertionPoint, handler); } void CState::UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification) @@ -647,20 +656,17 @@ const wxArrayString& files = pFileDataObject->GetFilenames(); - for (unsigned int i = 0; i < files.Count(); i++) - { + for (unsigned int i = 0; i < files.Count(); ++i) { int64_t size; bool is_link; - CLocalFileSystem::local_fileType type = CLocalFileSystem::GetFileInfo(files[i], is_link, &size, 0, 0); - if (type == CLocalFileSystem::file) - { + 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); m_mainFrame.GetQueue()->QueueFile_Finish(!queueOnly); } - else if (type == CLocalFileSystem::dir) - { + else if (type == fz::local_filesys::dir) { CLocalPath localPath(files[i]); if (localPath.HasParent()) { @@ -681,15 +687,15 @@ #ifdef __WXMSW__ int len = 1; - for (unsigned int i = 0; i < files.Count(); i++) + for (unsigned int i = 0; i < files.Count(); ++i) { len += files[i].Len() + 1; + } // SHFILEOPSTRUCT's pTo and pFrom accept null-terminated lists // of null-terminated filenames. wxChar* from = new wxChar[len]; wxChar* p = from; - for (unsigned int i = 0; i < files.Count(); i++) - { + for (unsigned int i = 0; i < files.Count(); ++i) { wxStrcpy(p, files[i]); p += files[i].Len() + 1; } @@ -710,15 +716,13 @@ delete [] from; #else wxString error; - for (unsigned int i = 0; i < files.Count(); i++) - { - const wxString& file(files[i]); + for (unsigned int i = 0; i < files.Count(); ++i) { + wxString const& file(files[i]); int64_t size; bool is_link; - CLocalFileSystem::local_fileType type = CLocalFileSystem::GetFileInfo(file, is_link, &size, 0, 0); - if (type == CLocalFileSystem::file) - { + 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; CLocalPath sourcePath(file, &name); if (name.empty()) @@ -732,21 +736,18 @@ else wxRenameFile(file, target); } - else if (type == CLocalFileSystem::dir) - { + else if (type == fz::local_filesys::dir) { CLocalPath sourcePath(file); if (sourcePath == path || sourcePath.GetParent() == path) continue; - if (sourcePath.IsParentOf(path)) - { + if (sourcePath.IsParentOf(path)) { error = _("A directory cannot be dragged into one of its subdirectories."); continue; } if (copy) RecursiveCopy(sourcePath, path); - else - { + else { if (!sourcePath.HasParent()) continue; wxRenameFile(file, path.GetPath() + sourcePath.GetLastSegment()); @@ -782,28 +783,24 @@ dirsToVisit.push_back(last_segment + CLocalPath::path_separator); // Process any subdirs which still have to be visited - while (!dirsToVisit.empty()) - { + while (!dirsToVisit.empty()) { wxString dirname = dirsToVisit.front(); dirsToVisit.pop_front(); wxMkdir(target.GetPath() + dirname); - CLocalFileSystem fs; - if (!fs.BeginFindFiles(source.GetPath() + dirname, false)) + fz::local_filesys fs; + if (!fs.begin_find_files(fz::to_native(source.GetPath() + dirname), false)) continue; bool is_dir, is_link; - wxString file; - while (fs.GetNextFile(file, is_link, is_dir, 0, 0, 0)) - { - if (file.empty()) - { + fz::native_string file; + while (fs.get_next_file(file, is_link, is_dir, 0, 0, 0)) { + if (file.empty()) { wxGetApp().DisplayEncodingWarning(); continue; } - if (is_dir) - { + if (is_dir) { if (is_link) continue; @@ -823,8 +820,7 @@ bool hasDirs = false; bool hasFiles = false; const std::list& files = pRemoteDataObject->GetFiles(); - for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) - { + for (std::list::const_iterator iter = files.begin(); iter != files.end(); ++iter) { if (iter->dir) hasDirs = true; else @@ -842,20 +838,26 @@ 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) continue; CLocalPath newPath(path); newPath.AddSegment(CQueueView::ReplaceInvalidCharacters(iter->name)); - m_pRecursiveOperation->AddDirectoryToVisit(pRemoteDataObject->GetServerPath(), iter->name, newPath, iter->link); + root.add_dir_to_visit(pRemoteDataObject->GetServerPath(), iter->name, newPath, iter->link); } - if (m_pComparisonManager->IsComparing()) - m_pComparisonManager->ExitComparisonMode(); + if (!root.empty()) { + if (m_pComparisonManager->IsComparing()) + m_pComparisonManager->ExitComparisonMode(); + + m_pRecursiveOperation->AddRecursionRoot(std::move(root)); - CFilterManager filter; - m_pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, pRemoteDataObject->GetServerPath(), filter.GetActiveFilters(false)); + CFilterManager filter; + m_pRecursiveOperation->StartRecursiveOperation(queueOnly ? CRecursiveOperation::recursive_addtoqueue : CRecursiveOperation::recursive_download, + filter.GetActiveFilters(false), pRemoteDataObject->GetServerPath()); + } return true; } @@ -879,7 +881,7 @@ return m_pCommandQueue->Idle(ignore_recursive ? CCommandQueue::normal : CCommandQueue::any); } -void CState::ListingFailed(int error) +void CState::ListingFailed(int) { if (m_sync_browse.is_changing && !m_sync_browse.target_path.empty()) { wxDialogEx dlg; diff -Nru filezilla-3.14.1/src/interface/state.h filezilla-3.15.0.2/src/interface/state.h --- filezilla-3.14.1/src/interface/state.h 2015-08-26 03:30:03.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/state.h 2016-02-10 19:27:09.000000000 +0000 @@ -126,7 +126,7 @@ bool RefreshRemote(); - void RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification); + void RegisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification, CStateEventHandler* insertBefore = 0); void UnregisterHandler(CStateEventHandler* pHandler, enum t_statechange_notifications notification); CFileZillaEngine* m_pEngine{}; diff -Nru filezilla-3.14.1/src/interface/statuslinectrl.cpp filezilla-3.15.0.2/src/interface/statuslinectrl.cpp --- filezilla-3.14.1/src/interface/statuslinectrl.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/statuslinectrl.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -91,7 +91,7 @@ refresh = 31; } - duration elapsed; + fz::duration elapsed; int left = -1; wxFileOffset rate; wxString bytes_and_rate; @@ -119,8 +119,8 @@ } int elapsed_milli_seconds = 0; - if (status_.started.IsValid()) { - elapsed = CDateTime::Now() - status_.started; + if (status_.started.empty()) { + elapsed = fz::datetime::now() - status_.started; elapsed_milli_seconds = static_cast(elapsed.get_milliseconds()); // Assume it doesn't overflow } @@ -343,7 +343,7 @@ // Draw percentage-done text wxString text; if (permill > 1000) { - text = _T("> 100.0%%"); + text = _T("> 100.0%"); } else { text = wxString::Format(_T("%d.%d%%"), permill / 10, permill % 10); diff -Nru filezilla-3.14.1/src/interface/StatusView.cpp filezilla-3.15.0.2/src/interface/StatusView.cpp --- filezilla-3.14.1/src/interface/StatusView.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/StatusView.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -127,10 +127,10 @@ void CStatusView::AddToLog(CLogmsgNotification const& notification) { - AddToLog(notification.msgType, notification.msg, CDateTime::Now()); + AddToLog(notification.msgType, notification.msg, fz::datetime::now()); } -void CStatusView::AddToLog(MessageType messagetype, const wxString& message, CDateTime const& time) +void CStatusView::AddToLog(MessageType messagetype, const wxString& message, fz::datetime const& time) { if (!m_shown) { if (m_hiddenLines.size() >= MAX_LINECOUNT) { @@ -186,10 +186,10 @@ if (time != m_lastTime) { m_lastTime = time; #ifndef __WXMAC__ - m_lastTimeString = time.Format(_T("%H:%M:%S\t"), CDateTime::local); + m_lastTimeString = time.format(_T("%H:%M:%S\t"), fz::datetime::local); #else // Tabs on OS X cannot be freely positioned - m_lastTimeString = time.Format(_T("%H:%M:%S "), CDateTime::local); + m_lastTimeString = time.format(_T("%H:%M:%S "), fz::datetime::local); #endif } prefix += m_lastTimeString; @@ -258,8 +258,8 @@ void CStatusView::InitDefAttr() { m_showTimestamps = COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_TIMESTAMP) != 0; - m_lastTime = CDateTime::Now(); - m_lastTimeString = m_lastTime.Format(_T("%H:%M:%S\t"), CDateTime::local); + m_lastTime = fz::datetime::now(); + m_lastTimeString = m_lastTime.format(_T("%H:%M:%S\t"), fz::datetime::local); // Measure withs of all types wxClientDC dc(this); diff -Nru filezilla-3.14.1/src/interface/StatusView.h filezilla-3.15.0.2/src/interface/StatusView.h --- filezilla-3.14.1/src/interface/StatusView.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/StatusView.h 2016-02-05 08:54:46.000000000 +0000 @@ -17,7 +17,7 @@ virtual ~CStatusView(); void AddToLog(CLogmsgNotification const& pNotification); - void AddToLog(MessageType messagetype, const wxString& message, CDateTime const& time); + void AddToLog(MessageType messagetype, const wxString& message, fz::datetime const& time); void InitDefAttr(); @@ -63,12 +63,12 @@ { MessageType messagetype; wxString message; - CDateTime time; + fz::datetime time; }; std::list m_hiddenLines; bool m_showTimestamps{}; - CDateTime m_lastTime; + fz::datetime m_lastTime; wxString m_lastTimeString; }; diff -Nru filezilla-3.14.1/src/interface/systemimagelist.cpp filezilla-3.15.0.2/src/interface/systemimagelist.cpp --- filezilla-3.14.1/src/interface/systemimagelist.cpp 2014-08-13 03:30:07.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/systemimagelist.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -173,7 +173,7 @@ SHFILEINFO shFinfo; memset(&shFinfo, 0, sizeof(SHFILEINFO)); - if (SHGetFileInfo(!fileName.empty() ? fileName : _T("{B97D3074-1830-4b4a-9D8A-17A38B074052}"), + if (SHGetFileInfo(!fileName.empty() ? fileName.wc_str() : _T("{B97D3074-1830-4b4a-9D8A-17A38B074052}"), (type != iconType::file) ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL, &shFinfo, sizeof(SHFILEINFO), @@ -185,6 +185,8 @@ return icon; } #else + (void)physical; + int icon; switch (type) { diff -Nru filezilla-3.14.1/src/interface/themeprovider.cpp filezilla-3.15.0.2/src/interface/themeprovider.cpp --- filezilla-3.14.1/src/interface/themeprovider.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/themeprovider.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -81,14 +81,12 @@ std::list dirs = GetSearchDirs(size); - wxString name = id.Mid(4); - // 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. - MakeLowerAscii(name); - + wxString name = fz::str_tolower_ascii(id.Mid(4)); + wxLogNull logNull; for (auto const& dir : dirs) { @@ -118,13 +116,11 @@ std::list dirs = GetSearchDirs(size); - wxString name = id.Mid(4); - // 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. - MakeLowerAscii(name); + wxString name = fz::str_tolower_ascii(id.Mid(4)); wxLogNull logNull; @@ -235,15 +231,14 @@ return sizes; } -wxIconBundle CThemeProvider::GetIconBundle(const wxArtID& id, const wxArtClient& client /*=wxART_OTHER*/) +wxIconBundle CThemeProvider::GetIconBundle(const wxArtID& id, const wxArtClient&) { wxIconBundle iconBundle; if (id.Left(4) != _T("ART_")) return iconBundle; - wxString name = id.Mid(4); - MakeLowerAscii(name); + wxString name = fz::str_tolower_ascii(id.Mid(4)); const wxChar* dirs[] = { _T("16x16/"), _T("32x32/"), _T("48x48/") }; @@ -294,7 +289,7 @@ return resourceDir.GetPath(); } -void CThemeProvider::OnOptionsChanged(changed_options_t const& options) +void CThemeProvider::OnOptionsChanged(changed_options_t const&) { m_themePath = GetThemePath(); diff -Nru filezilla-3.14.1/src/interface/timeformatting.cpp filezilla-3.15.0.2/src/interface/timeformatting.cpp --- filezilla-3.14.1/src/interface/timeformatting.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/timeformatting.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -25,7 +25,7 @@ m_dateFormat = _T("%Y-%m-%d"); else if (!dateFormat.empty() && dateFormat[0] == '2') { dateFormat = dateFormat.Mid(1); - if (CDateTime::VerifyFormat(dateFormat)) { + if (fz::datetime::verify_format(dateFormat.ToStdWstring())) { m_dateFormat = dateFormat; } else { @@ -42,7 +42,7 @@ m_dateTimeFormat += _T("%H:%M"); else if (!timeFormat.empty() && timeFormat[0] == '2') { timeFormat = timeFormat.Mid(1); - if (CDateTime::VerifyFormat(timeFormat)) { + if (fz::datetime::verify_format(timeFormat.ToStdWstring())) { m_dateTimeFormat += timeFormat; } else { @@ -69,11 +69,11 @@ } } -wxString CTimeFormat::Format(CDateTime const& time) +wxString CTimeFormat::Format(fz::datetime const& time) { wxString ret; - if (time.IsValid()) { - if( time.GetAccuracy() > CDateTime::days ) { + if (time.empty()) { + if (time.get_accuracy() > fz::datetime::days) { ret = FormatDateTime(time); } else { @@ -83,16 +83,16 @@ return ret; } -wxString CTimeFormat::FormatDateTime(CDateTime const& time) +wxString CTimeFormat::FormatDateTime(fz::datetime const& time) { Impl& impl = GetImpl(); - return time.Format(impl.m_dateTimeFormat, CDateTime::local); + return time.format(impl.m_dateTimeFormat.ToStdWstring(), fz::datetime::local); } -wxString CTimeFormat::FormatDate(CDateTime const& time) +wxString CTimeFormat::FormatDate(fz::datetime const& time) { Impl& impl = GetImpl(); - return time.Format(impl.m_dateFormat, CDateTime::local); + return time.format(impl.m_dateFormat.ToStdWstring(), fz::datetime::local); } \ No newline at end of file diff -Nru filezilla-3.14.1/src/interface/timeformatting.h filezilla-3.15.0.2/src/interface/timeformatting.h --- filezilla-3.14.1/src/interface/timeformatting.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/timeformatting.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,14 +1,16 @@ #ifndef __TIMEFORMATTING_H__ #define __TIMEFORMATTING_H__ -class CDateTime; +namespace fz { +class datetime; +} class CTimeFormat { public: - static wxString Format(CDateTime const& time); - static wxString FormatDateTime(CDateTime const& time); - static wxString FormatDate(CDateTime const& time); + static wxString Format(fz::datetime const& time); + static wxString FormatDateTime(fz::datetime const& time); + static wxString FormatDate(fz::datetime const& time); }; #endif //__TIMEFORMATTING_H__ diff -Nru filezilla-3.14.1/src/interface/updater.cpp filezilla-3.15.0.2/src/interface/updater.cpp --- filezilla-3.14.1/src/interface/updater.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/updater.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -6,11 +6,12 @@ #include "updater.h" #include "Options.h" #include "file_utils.h" -#include #include #include #include +#include + #include // This is ugly but does the job @@ -150,11 +151,11 @@ if (lastCheckStr.empty()) return true; - CDateTime lastCheck(lastCheckStr, CDateTime::utc); - if (!lastCheck.IsValid()) + fz::datetime lastCheck(lastCheckStr.ToStdWstring(), fz::datetime::utc); + if (!lastCheck.empty()) return true; - auto const span = CDateTime::Now() - lastCheck; + auto const span = fz::datetime::now() - lastCheck; if (span.get_seconds() < 0) // Last check in future @@ -205,11 +206,11 @@ return false; } - auto const t = CDateTime::Now(); - COptions::Get()->SetOption(OPTION_UPDATECHECK_LASTDATE, t.Format(_T("%Y-%m-%d %H:%M:%S"), CDateTime::utc)); + auto const t = fz::datetime::now(); + COptions::Get()->SetOption(OPTION_UPDATECHECK_LASTDATE, t.format(_T("%Y-%m-%d %H:%M:%S"), fz::datetime::utc)); local_file_.clear(); - log_ = wxString::Format(_("Started update check on %s\n"), t.Format(_T("%Y-%m-%d %H:%M:%S"), CDateTime::local)); + 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() ) { @@ -358,14 +359,14 @@ ParseData(); - if( version_information_.available_.version_.empty() ) { + if (version_information_.available_.version_.empty()) { s = UpdaterState::idle; } - else if( !version_information_.available_.url_.empty() ) { + else if (!version_information_.available_.url_.empty()) { wxString const temp = GetTempFile(); wxString const local_file = GetLocalFile(version_information_.available_, true); - if( !local_file.empty() && CLocalFileSystem::GetFileType(local_file) != CLocalFileSystem::unknown) { + if (!local_file.empty() && fz::local_filesys::get_file_type(fz::to_native(local_file)) != fz::local_filesys::unknown) { local_file_ = local_file; log_ += wxString::Format(_("Local file is %s\n"), local_file); s = UpdaterState::newversion_ready; @@ -374,12 +375,12 @@ // We got a checksum over a secure channel already. m_use_internal_rootcert = false; - if( temp.empty() || local_file.empty() ) { + if (temp.empty() || local_file.empty()) { s = UpdaterState::newversion; } else { s = UpdaterState::newversion_downloading; - auto size = CLocalFileSystem::GetSize(temp); + auto size = fz::local_filesys::get_size(fz::to_native(temp)); if (size >= 0 && size >= version_information_.available_.size_) { s = ProcessFinishedDownload(); } @@ -473,20 +474,20 @@ int i = 1; wxString f = dl + fn; - while( CLocalFileSystem::GetFileType(f) != CLocalFileSystem::unknown && (!allow_existing || !VerifyChecksum(f, b.size_, b.hash_))) { - if( ++i > 99 ) { + while (fz::local_filesys::get_file_type(fz::to_native(f)) != fz::local_filesys::unknown && (!allow_existing || !VerifyChecksum(f, b.size_, b.hash_))) { + if (++i > 99) { return wxString(); } wxString ext; int pos; - if( !fn.Right(8).CmpNoCase(_T(".tar.bz2")) ) { + if (!fn.Right(8).CmpNoCase(_T(".tar.bz2"))) { pos = fn.size() - 8; } else { pos = fn.Find('.', true); } - if( pos == -1 ) { + if (pos == -1) { f = dl + fn + wxString::Format(_T(" (%d)"), i); } else { @@ -577,16 +578,16 @@ wxString versionOrDate = tokens.GetNextToken(); if (type == _T("nightly")) { - CDateTime nightlyDate(versionOrDate, CDateTime::utc); - if (!nightlyDate.IsValid()) { + fz::datetime nightlyDate(versionOrDate.ToStdWstring(), fz::datetime::utc); + if (!nightlyDate.empty()) { if (COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4) { log_ += _T("Could not parse nightly date\n"); } continue; } - CDateTime buildDate = CBuildInfo::GetBuildDate(); - if (!buildDate.IsValid() || !nightlyDate.IsValid() || nightlyDate <= buildDate) { + fz::datetime buildDate = CBuildInfo::GetBuildDate(); + if (!buildDate.empty() || !nightlyDate.empty() || nightlyDate <= buildDate) { if( COptions::Get()->GetOptionVal(OPTION_LOGGING_DEBUGLEVEL) == 4 ) { log_ += _T("Nightly isn't newer\n"); } @@ -664,7 +665,7 @@ return false; } - auto filesize = CLocalFileSystem::GetSize(file); + auto filesize = fz::local_filesys::get_size(fz::to_native(file)); if (filesize < 0 || filesize != size) { return false; } @@ -807,13 +808,13 @@ int64_t ret{-1}; if (state_ == UpdaterState::newversion_ready) { if (!local_file_.empty()) { - ret = CLocalFileSystem::GetSize(local_file_); + ret = fz::local_filesys::get_size(fz::to_native(local_file_)); } } else if( state_ == UpdaterState::newversion_downloading ) { wxString const temp = GetTempFile(); if( !temp.empty() ) { - ret = CLocalFileSystem::GetSize(temp); + ret = fz::local_filesys::get_size(fz::to_native(temp)); } } return ret; diff -Nru filezilla-3.14.1/src/interface/verifycertdialog.cpp filezilla-3.15.0.2/src/interface/verifycertdialog.cpp --- filezilla-3.14.1/src/interface/verifycertdialog.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/verifycertdialog.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -27,8 +27,8 @@ bool CVerifyCertDialog::DisplayCert(wxDialogEx* pDlg, const CCertificate& cert) { bool warning = false; - if (cert.GetActivationTime().IsValid()) { - if (cert.GetActivationTime() > CDateTime::Now()) { + 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; @@ -41,8 +41,8 @@ pDlg->SetChildLabel(XRCID("ID_ACTIVATION_TIME"), _("Invalid date")); } - if (cert.GetExpirationTime().IsValid()) { - if (cert.GetExpirationTime() < CDateTime::Now()) { + 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; @@ -92,6 +92,10 @@ min.y = maxHeight; min.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); } + + // Add extra safety margin to prevent squishing on OS X. + min.x += 2; + subjectPanel->SetMinSize(min); subjectPanel->Thaw(); @@ -528,8 +532,8 @@ auto xCert = certs.append_child("Certificate"); AddTextElement(xCert, "Data", ConvertHexToString(data, len)); - AddTextElement(xCert, "ActivationTime", static_cast(certificate.GetActivationTime().GetTimeT())); - AddTextElement(xCert, "ExpirationTime", static_cast(certificate.GetExpirationTime().GetTimeT())); + 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()); diff -Nru filezilla-3.14.1/src/interface/volume_enumerator.cpp filezilla-3.15.0.2/src/interface/volume_enumerator.cpp --- filezilla-3.14.1/src/interface/volume_enumerator.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/volume_enumerator.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -9,35 +9,31 @@ DEFINE_EVENT_TYPE(fzEVT_VOLUMESENUMERATED) CVolumeDescriptionEnumeratorThread::CVolumeDescriptionEnumeratorThread(wxEvtHandler* pEvtHandler) - : wxThread(wxTHREAD_JOINABLE), - m_pEvtHandler(pEvtHandler) + : m_pEvtHandler(pEvtHandler) { m_failure = false; m_stop = false; m_running = true; - if (Create() != wxTHREAD_NO_ERROR) - { + if (!run()) { m_running = false; m_failure = true; } - Run(); } CVolumeDescriptionEnumeratorThread::~CVolumeDescriptionEnumeratorThread() { m_stop = true; - Wait(wxTHREAD_WAIT_BLOCK); + join(); - for (std::list::const_iterator iter = m_volumeInfo.begin(); iter != m_volumeInfo.end(); ++iter) - { + for (auto iter = m_volumeInfo.cbegin(); iter != m_volumeInfo.cend(); ++iter) { delete [] iter->pVolume; delete [] iter->pVolumeName; } m_volumeInfo.clear(); } -wxThread::ExitCode CVolumeDescriptionEnumeratorThread::Entry() +void CVolumeDescriptionEnumeratorThread::entry() { if (!GetDriveLabels()) m_failure = true; @@ -45,13 +41,11 @@ m_running = false; m_pEvtHandler->QueueEvent(new wxCommandEvent(fzEVT_VOLUMESENUMERATED)); - - return 0; } void CVolumeDescriptionEnumeratorThread::ProcessDrive(wxString const& drive) { - if( GetDriveLabel(drive) ) { + if ( GetDriveLabel(drive)) { m_pEvtHandler->QueueEvent(new wxCommandEvent(fzEVT_VOLUMEENUMERATED)); } } @@ -74,7 +68,7 @@ wxChar *share_name = new wxChar[512]; DWORD dwSize = 511; if (!WNetGetConnection(pVolume, share_name, &dwSize)) { - scoped_lock l(sync_); + fz::scoped_lock l(sync_); t_VolumeInfoInternal volumeInfo; volumeInfo.pVolume = pVolume; volumeInfo.pVolumeName = share_name; @@ -87,10 +81,10 @@ // Get the label of the drive wxChar* pVolumeName = new wxChar[501]; int oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); - BOOL res = GetVolumeInformation(drive, pVolumeName, 500, 0, 0, 0, 0, 0); + BOOL res = GetVolumeInformation(drive.wc_str(), pVolumeName, 500, 0, 0, 0, 0, 0); SetErrorMode(oldErrorMode); if (res && pVolumeName[0]) { - scoped_lock l(sync_); + fz::scoped_lock l(sync_); t_VolumeInfoInternal volumeInfo; volumeInfo.pVolume = pVolume; volumeInfo.pVolumeName = pVolumeName; @@ -185,7 +179,7 @@ const wxChar* pDrive = drives; while (*pDrive) { - const int drivelen = wxStrlen(pDrive); + const int drivelen = fz::strlen(pDrive); if (!IsHidden(pDrive, drivesToHide)) { ret.push_back(pDrive); @@ -204,7 +198,7 @@ { std::list volumeInfo; - scoped_lock l(sync_); + fz::scoped_lock l(sync_); for (auto const& internal_info : m_volumeInfo) { t_VolumeInfo info; diff -Nru filezilla-3.14.1/src/interface/volume_enumerator.h filezilla-3.15.0.2/src/interface/volume_enumerator.h --- filezilla-3.14.1/src/interface/volume_enumerator.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/volume_enumerator.h 2016-02-05 08:54:46.000000000 +0000 @@ -23,7 +23,7 @@ DECLARE_EVENT_TYPE(fzEVT_VOLUMEENUMERATED, -1) DECLARE_EVENT_TYPE(fzEVT_VOLUMESENUMERATED, -1) -class CVolumeDescriptionEnumeratorThread final : protected wxThread +class CVolumeDescriptionEnumeratorThread final : protected fz::thread { public: CVolumeDescriptionEnumeratorThread(wxEvtHandler* pEvtHandler); @@ -48,7 +48,7 @@ bool GetDriveLabels(); void ProcessDrive(wxString const& drive); bool GetDriveLabel(wxString const& drive); - virtual ExitCode Entry(); + virtual void entry(); wxEvtHandler* m_pEvtHandler; @@ -64,7 +64,7 @@ std::list m_volumeInfo; - mutex sync_; + fz::mutex sync_; }; #endif //__WXMSW__ diff -Nru filezilla-3.14.1/src/interface/wrapengine.cpp filezilla-3.15.0.2/src/interface/wrapengine.cpp --- filezilla-3.14.1/src/interface/wrapengine.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/wrapengine.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -5,7 +5,8 @@ #include "xmlfunctions.h" #include "buildinfo.h" #include "Options.h" -#include "local_filesys.h" + +#include #include #include @@ -976,8 +977,8 @@ if (!wxFileName::FileExists(resourceDir.GetPath() + xrc)) continue; - CDateTime const date = CLocalFileSystem::GetModificationTime(resourceDir.GetPath() + xrc); - wxString const ticks = std::to_wstring(date.GetTimeT()); + 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()); auto resourceElement = FindElementWithAttribute(resources, "xrc", "file", xrc.mb_str()); if (!resourceElement) { @@ -1050,8 +1051,8 @@ wxString name = GetLocaleFile(localesDir.GetPath(), language); if (!name.empty()) { - CDateTime const date = CLocalFileSystem::GetModificationTime(localesDir.GetPath() + name + _T("/filezilla.mo")); - wxString const ticks = std::to_wstring(date.GetTimeT()); + 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()); wxString languageNodeDate = GetTextAttribute(languageElement, "date"); if (languageNodeDate.empty() || languageNodeDate != ticks) { diff -Nru filezilla-3.14.1/src/interface/xmlfunctions.cpp filezilla-3.15.0.2/src/interface/xmlfunctions.cpp --- filezilla-3.14.1/src/interface/xmlfunctions.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/xmlfunctions.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -6,7 +6,7 @@ #include #include -#include +#include CXmlFile::CXmlFile(wxString const& fileName, wxString const& root) { @@ -20,7 +20,7 @@ { wxASSERT(!name.empty()); m_fileName = name; - m_modificationTime = CDateTime(); + m_modificationTime = fz::datetime(); } CXmlFile::~CXmlFile() @@ -51,10 +51,10 @@ GetXmlFile(redirectedName + _T("~")); if (!m_element) { // Loading backup failed. If both original and backup file are empty, create new file. - if (CLocalFileSystem::GetSize(redirectedName) <= 0 && CLocalFileSystem::GetSize(redirectedName + _T("~")) <= 0) { + if (fz::local_filesys::get_size(fz::to_native(redirectedName)) <= 0 && fz::local_filesys::get_size(fz::to_native(redirectedName + _T("~"))) <= 0) { m_error.clear(); CreateEmpty(); - m_modificationTime = CLocalFileSystem::GetModificationTime(redirectedName); + m_modificationTime = fz::local_filesys::get_modification_time(fz::to_native(redirectedName)); return m_element; } @@ -85,7 +85,7 @@ m_error.clear(); } - m_modificationTime = CLocalFileSystem::GetModificationTime(redirectedName); + m_modificationTime = fz::local_filesys::get_modification_time(fz::to_native(redirectedName)); return m_element; } @@ -93,11 +93,11 @@ { wxCHECK(!m_fileName.empty(), false); - if (!m_modificationTime.IsValid()) + if (!m_modificationTime.empty()) return true; - CDateTime const modificationTime = CLocalFileSystem::GetModificationTime(m_fileName); - if (modificationTime.IsValid() && modificationTime == m_modificationTime) + fz::datetime const modificationTime = fz::local_filesys::get_modification_time(fz::to_native(m_fileName)); + if (modificationTime.empty() && modificationTime == m_modificationTime) return false; return true; @@ -138,7 +138,7 @@ UpdateMetadata(); bool res = SaveXmlFile(); - m_modificationTime = CLocalFileSystem::GetModificationTime(m_fileName); + m_modificationTime = fz::local_filesys::get_modification_time(fz::to_native(m_fileName)); if (!res && printError) { wxASSERT(!m_error.empty()); @@ -285,7 +285,7 @@ { Close(); - if (CLocalFileSystem::GetSize(file) <= 0) { + if (fz::local_filesys::get_size(fz::to_native(file)) <= 0) { return false; } @@ -314,9 +314,9 @@ { wxString redirectedName = m_fileName; bool isLink = false; - if (CLocalFileSystem::GetFileInfo(m_fileName, isLink, 0, 0, 0) == CLocalFileSystem::file) { + if (fz::local_filesys::get_file_info(fz::to_native(redirectedName), isLink, 0, 0, 0) == fz::local_filesys::file) { if (isLink) { - CLocalPath target(CLocalFileSystem::GetSymbolicLinkTarget(m_fileName)); + CLocalPath target(fz::local_filesys::get_link_target(fz::to_native(redirectedName))); if (!target.empty()) { redirectedName = target.GetPath(); redirectedName.RemoveLast(); @@ -334,10 +334,10 @@ int flags = 0; wxString redirectedName = GetRedirectedName(); - if (CLocalFileSystem::GetFileInfo(redirectedName, isLink, 0, 0, &flags) == CLocalFileSystem::file) { + 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) - SetFileAttributes(redirectedName, flags & ~FILE_ATTRIBUTE_HIDDEN); + SetFileAttributes(redirectedName.c_str(), flags & ~FILE_ATTRIBUTE_HIDDEN); #endif exists = true; @@ -689,7 +689,7 @@ { Close(); m_document.load_string(data); - m_element = m_document.child(m_rootName); + m_element = m_document.child(m_rootName.mb_str()); if (!m_element) { Close(); } diff -Nru filezilla-3.14.1/src/interface/xmlfunctions.h filezilla-3.15.0.2/src/interface/xmlfunctions.h --- filezilla-3.14.1/src/interface/xmlfunctions.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/interface/xmlfunctions.h 2016-02-05 08:54:46.000000000 +0000 @@ -12,13 +12,16 @@ #include "../pugixml/pugixml.hpp" #endif -class CXmlFile +class CXmlFile final { public: - CXmlFile() {}; + CXmlFile() = default; explicit CXmlFile(const wxString& fileName, wxString const& root = wxString()); - virtual ~CXmlFile(); + ~CXmlFile(); + + CXmlFile(CXmlFile const&) = delete; + CXmlFile& operator=(CXmlFile const&) = delete; pugi::xml_node CreateEmpty(); @@ -59,7 +62,7 @@ // Save the XML document to the given file bool SaveXmlFile(); - CDateTime m_modificationTime; + fz::datetime m_modificationTime; wxString m_fileName; pugi::xml_document m_document; pugi::xml_node m_element; diff -Nru filezilla-3.14.1/src/Makefile.in filezilla-3.15.0.2/src/Makefile.in --- filezilla-3.14.1/src/Makefile.in 2015-10-16 09:55:31.000000000 +0000 +++ filezilla-3.15.0.2/src/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -233,6 +233,8 @@ 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@ diff -Nru filezilla-3.14.1/src/pugixml/Makefile.in filezilla-3.15.0.2/src/pugixml/Makefile.in --- filezilla-3.14.1/src/pugixml/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/pugixml/Makefile.in 2016-02-10 19:38:51.000000000 +0000 @@ -232,6 +232,8 @@ 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@ diff -Nru filezilla-3.14.1/src/pugixml/pugiconfig.hpp filezilla-3.15.0.2/src/pugixml/pugiconfig.hpp --- filezilla-3.14.1/src/pugixml/pugiconfig.hpp 2015-07-28 14:57:50.000000000 +0000 +++ filezilla-3.15.0.2/src/pugixml/pugiconfig.hpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.6 + * pugixml parser - version 1.7 * -------------------------------------------------------- * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ @@ -17,6 +17,9 @@ // Uncomment this to enable wchar_t mode // #define PUGIXML_WCHAR_MODE +// Uncomment this to enable compact mode +// #define PUGIXML_COMPACT + // Uncomment this to disable XPath #define PUGIXML_NO_XPATH diff -Nru filezilla-3.14.1/src/pugixml/pugixml.cpp filezilla-3.15.0.2/src/pugixml/pugixml.cpp --- filezilla-3.14.1/src/pugixml/pugixml.cpp 2015-07-28 14:57:50.000000000 +0000 +++ filezilla-3.15.0.2/src/pugixml/pugixml.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.6 + * pugixml parser - version 1.7 * -------------------------------------------------------- * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef PUGIXML_WCHAR_MODE # include @@ -105,6 +106,7 @@ #if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST) using std::memcpy; using std::memmove; +using std::memset; #endif // In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features @@ -133,16 +135,16 @@ #if !defined(_MSC_VER) || _MSC_VER >= 1600 # include #else +namespace pugi +{ # ifndef _UINTPTR_T_DEFINED -// No native uintptr_t in MSVC6 and in some WinCE versions -typedef size_t uintptr_t; -#define _UINTPTR_T_DEFINED + typedef size_t uintptr_t; # endif -PUGI__NS_BEGIN + typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; -PUGI__NS_END +} #endif // Memory allocation @@ -221,42 +223,174 @@ return static_cast(end - s); #endif } - -#ifdef PUGIXML_WCHAR_MODE - // Convert string to wide string, assuming all symbols are ASCII - PUGI__FN void widen_ascii(wchar_t* dest, const char* source) - { - for (const char* i = source; *i; ++i) *dest++ = *i; - *dest = 0; - } -#endif PUGI__NS_END -#if !defined(PUGIXML_NO_STL) || !defined(PUGIXML_NO_XPATH) -// auto_ptr-like buffer holder for exception recovery +// auto_ptr-like object for exception recovery PUGI__NS_BEGIN - struct buffer_holder + template struct auto_deleter { - void* data; - void (*deleter)(void*); + T* data; + D deleter; - buffer_holder(void* data_, void (*deleter_)(void*)): data(data_), deleter(deleter_) + auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_) { } - ~buffer_holder() + ~auto_deleter() { if (data) deleter(data); } - void* release() + T* release() { - void* result = data; + T* result = data; data = 0; return result; } }; PUGI__NS_END + +#ifdef PUGIXML_COMPACT +PUGI__NS_BEGIN + class compact_hash_table + { + public: + compact_hash_table(): _items(0), _capacity(0), _count(0) + { + } + + void clear() + { + if (_items) + { + xml_memory::deallocate(_items); + _items = 0; + _capacity = 0; + _count = 0; + } + } + + void** find(const void* key) + { + assert(key); + + if (_capacity == 0) return 0; + + size_t hashmod = _capacity - 1; + size_t bucket = hash(key) & hashmod; + + for (size_t probe = 0; probe <= hashmod; ++probe) + { + item_t& probe_item = _items[bucket]; + + if (probe_item.key == key) + return &probe_item.value; + + if (probe_item.key == 0) + return 0; + + // hash collision, quadratic probing + bucket = (bucket + probe + 1) & hashmod; + } + + assert(!"Hash table is full"); + return 0; + } + + void** insert(const void* key) + { + assert(key); + assert(_capacity != 0 && _count < _capacity - _capacity / 4); + + size_t hashmod = _capacity - 1; + size_t bucket = hash(key) & hashmod; + + for (size_t probe = 0; probe <= hashmod; ++probe) + { + item_t& probe_item = _items[bucket]; + + if (probe_item.key == 0) + { + probe_item.key = key; + _count++; + return &probe_item.value; + } + + if (probe_item.key == key) + return &probe_item.value; + + // hash collision, quadratic probing + bucket = (bucket + probe + 1) & hashmod; + } + + assert(!"Hash table is full"); + return 0; + } + + bool reserve() + { + if (_count + 16 >= _capacity - _capacity / 4) + return rehash(); + + return true; + } + + private: + struct item_t + { + const void* key; + void* value; + }; + + item_t* _items; + size_t _capacity; + + size_t _count; + + bool rehash(); + + static unsigned int hash(const void* key) + { + unsigned int h = static_cast(reinterpret_cast(key)); + + // MurmurHash3 32-bit finalizer + h ^= h >> 16; + h *= 0x85ebca6bu; + h ^= h >> 13; + h *= 0xc2b2ae35u; + h ^= h >> 16; + + return h; + } + }; + + PUGI__FN_NO_INLINE bool compact_hash_table::rehash() + { + compact_hash_table rt; + rt._capacity = (_capacity == 0) ? 32 : _capacity * 2; + rt._items = static_cast(xml_memory::allocate(sizeof(item_t) * rt._capacity)); + + if (!rt._items) + return false; + + memset(rt._items, 0, sizeof(item_t) * rt._capacity); + + for (size_t i = 0; i < _capacity; ++i) + if (_items[i].key) + *rt.insert(_items[i].key) = _items[i].value; + + if (_items) + xml_memory::deallocate(_items); + + _capacity = rt._capacity; + _items = rt._items; + + assert(_count == rt._count); + + return true; + } + +PUGI__NS_END #endif PUGI__NS_BEGIN @@ -268,15 +402,34 @@ #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; + + // 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__GETPAGE_IMPL(header) (header).get_page() +#else + #define PUGI__GETPAGE_IMPL(header) reinterpret_cast((header) & impl::xml_memory_page_pointer_mask) +#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) struct xml_allocator; @@ -293,6 +446,12 @@ result->busy_size = 0; result->freed_size = 0; + #ifdef PUGIXML_COMPACT + result->compact_string_base = 0; + result->compact_shared_parent = 0; + result->compact_page_marker = 0; + #endif + return result; } @@ -303,6 +462,12 @@ size_t busy_size; size_t freed_size; + + #ifdef PUGIXML_COMPACT + char_t* compact_string_base; + void* compact_shared_parent; + uint32_t* compact_page_marker; + #endif }; struct xml_memory_string_header @@ -315,6 +480,9 @@ { xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size) { + #ifdef PUGIXML_COMPACT + _hash = 0; + #endif } xml_memory_page* allocate_page(size_t data_size) @@ -352,7 +520,8 @@ void* allocate_memory(size_t size, xml_memory_page*& out_page) { - if (_busy_size + size > xml_memory_page_size) return allocate_memory_oob(size, out_page); + if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size)) + return allocate_memory_oob(size, out_page); void* buf = reinterpret_cast(_root) + sizeof(xml_memory_page) + _busy_size; @@ -363,6 +532,44 @@ return buf; } + #ifdef PUGIXML_COMPACT + void* allocate_object(size_t size, xml_memory_page*& out_page) + { + void* result = allocate_memory(size + sizeof(uint32_t), out_page); + if (!result) return 0; + + // adjust for marker + ptrdiff_t offset = static_cast(result) - reinterpret_cast(out_page->compact_page_marker); + + if (PUGI__UNLIKELY(static_cast(offset) >= 256 * xml_memory_block_alignment)) + { + // insert new marker + uint32_t* marker = static_cast(result); + + *marker = static_cast(reinterpret_cast(marker) - reinterpret_cast(out_page)); + out_page->compact_page_marker = marker; + + // since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block + // this will make sure deallocate_memory correctly tracks the size + out_page->freed_size += sizeof(uint32_t); + + return marker + 1; + } + else + { + // roll back uint32_t part + _busy_size -= sizeof(uint32_t); + + return result; + } + } + #else + void* allocate_object(size_t size, xml_memory_page*& out_page) + { + return allocate_memory(size, out_page); + } + #endif + void deallocate_memory(void* ptr, size_t size, xml_memory_page* page) { if (page == _root) page->busy_size = _busy_size; @@ -380,7 +587,16 @@ assert(_root == page); // top page freed, just reset sizes - page->busy_size = page->freed_size = 0; + page->busy_size = 0; + page->freed_size = 0; + + #ifdef PUGIXML_COMPACT + // reset compact state to maximize efficiency + page->compact_string_base = 0; + page->compact_shared_parent = 0; + page->compact_page_marker = 0; + #endif + _busy_size = 0; } else @@ -400,15 +616,15 @@ char_t* allocate_string(size_t length) { - static const size_t max_encoded_offset = (1 << 16) * sizeof(void*); + static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment; PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset); // allocate memory for string and header block size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t); - // round size up to pointer alignment boundary - size_t full_size = (size + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1); + // round size up to block alignment boundary + size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1); xml_memory_page* page; xml_memory_string_header* header = static_cast(allocate_memory(full_size, page)); @@ -418,14 +634,14 @@ // setup header ptrdiff_t page_offset = reinterpret_cast(header) - reinterpret_cast(page) - sizeof(xml_memory_page); - assert(page_offset % sizeof(void*) == 0); + assert(page_offset % xml_memory_block_alignment == 0); assert(page_offset >= 0 && static_cast(page_offset) < max_encoded_offset); - header->page_offset = static_cast(static_cast(page_offset) / sizeof(void*)); + header->page_offset = static_cast(static_cast(page_offset) / xml_memory_block_alignment); // full_size == 0 for large strings that occupy the whole page - assert(full_size % sizeof(void*) == 0); + assert(full_size % xml_memory_block_alignment == 0); assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0)); - header->full_size = static_cast(full_size < max_encoded_offset ? full_size / sizeof(void*) : 0); + header->full_size = static_cast(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0); // round-trip through void* to avoid 'cast increases required alignment of target type' warning // header is guaranteed a pointer-sized alignment, which should be enough for char_t @@ -442,17 +658,30 @@ assert(header); // deallocate - size_t page_offset = sizeof(xml_memory_page) + header->page_offset * sizeof(void*); + size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment; xml_memory_page* page = reinterpret_cast(static_cast(reinterpret_cast(header) - page_offset)); // if full_size == 0 then this string occupies the whole page - size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * sizeof(void*); + size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment; deallocate_memory(header, full_size, page); } + bool reserve() + { + #ifdef PUGIXML_COMPACT + return _hash->reserve(); + #else + return true; + #endif + } + xml_memory_page* _root; size_t _busy_size; + + #ifdef PUGIXML_COMPACT + compact_hash_table* _hash; + #endif }; PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page) @@ -486,58 +715,399 @@ _root->prev->next = page; _root->prev = page; - } - // allocate inside page - page->busy_size = size; + page->busy_size = size; + } return reinterpret_cast(page) + sizeof(xml_memory_page); } PUGI__NS_END +#ifdef PUGIXML_COMPACT +PUGI__NS_BEGIN + static const uintptr_t compact_alignment_log2 = 2; + static const uintptr_t compact_alignment = 1 << compact_alignment_log2; + + class compact_header + { + public: + compact_header(xml_memory_page* page, unsigned int flags) + { + PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment); + + ptrdiff_t offset = (reinterpret_cast(this) - reinterpret_cast(page->compact_page_marker)); + assert(offset % compact_alignment == 0 && static_cast(offset) < 256 * compact_alignment); + + _page = static_cast(offset >> compact_alignment_log2); + _flags = static_cast(flags); + } + + void operator&=(uintptr_t mod) + { + _flags &= static_cast(mod); + } + + void operator|=(uintptr_t mod) + { + _flags |= static_cast(mod); + } + + uintptr_t operator&(uintptr_t mod) const + { + return _flags & mod; + } + + xml_memory_page* get_page() const + { + // round-trip through void* to silence 'cast increases required alignment of target type' warnings + const char* page_marker = reinterpret_cast(this) - (_page << compact_alignment_log2); + const char* page = page_marker - *reinterpret_cast(static_cast(page_marker)); + + return const_cast(reinterpret_cast(static_cast(page))); + } + + private: + unsigned char _page; + unsigned char _flags; + }; + + PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset) + { + const compact_header* header = reinterpret_cast(static_cast(object) - header_offset); + + return header->get_page(); + } + + template PUGI__FN_NO_INLINE T* compact_get_value(const void* object) + { + return static_cast(*compact_get_page(object, header_offset)->allocator->_hash->find(object)); + } + + template PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value) + { + *compact_get_page(object, header_offset)->allocator->_hash->insert(object) = value; + } + + template class compact_pointer + { + public: + compact_pointer(): _data(0) + { + } + + void operator=(const compact_pointer& rhs) + { + *this = rhs + 0; + } + + void operator=(T* value) + { + if (value) + { + // value is guaranteed to be compact-aligned; 'this' is not + // our decoding is based on 'this' aligned to compact alignment downwards (see operator T*) + // so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to + // compensate for arithmetic shift rounding for negative values + ptrdiff_t diff = reinterpret_cast(value) - reinterpret_cast(this); + ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start; + + if (static_cast(offset) <= 253) + _data = static_cast(offset + 1); + else + { + compact_set_value(this, value); + + _data = 255; + } + } + else + _data = 0; + } + + operator T*() const + { + if (_data) + { + if (_data < 255) + { + uintptr_t base = reinterpret_cast(this) & ~(compact_alignment - 1); + + return reinterpret_cast(base + ((_data - 1 + start) << compact_alignment_log2)); + } + else + return compact_get_value(this); + } + else + return 0; + } + + T* operator->() const + { + return *this; + } + + private: + unsigned char _data; + }; + + template class compact_pointer_parent + { + public: + compact_pointer_parent(): _data(0) + { + } + + void operator=(const compact_pointer_parent& rhs) + { + *this = rhs + 0; + } + + void operator=(T* value) + { + if (value) + { + // value is guaranteed to be compact-aligned; 'this' is not + // our decoding is based on 'this' aligned to compact alignment downwards (see operator T*) + // so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to + // compensate for arithmetic shift behavior for negative values + ptrdiff_t diff = reinterpret_cast(value) - reinterpret_cast(this); + ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533; + + if (static_cast(offset) <= 65533) + { + _data = static_cast(offset + 1); + } + else + { + xml_memory_page* page = compact_get_page(this, header_offset); + + if (PUGI__UNLIKELY(page->compact_shared_parent == 0)) + page->compact_shared_parent = value; + + if (page->compact_shared_parent == value) + { + _data = 65534; + } + else + { + compact_set_value(this, value); + + _data = 65535; + } + } + } + else + { + _data = 0; + } + } + + operator T*() const + { + if (_data) + { + if (_data < 65534) + { + uintptr_t base = reinterpret_cast(this) & ~(compact_alignment - 1); + + return reinterpret_cast(base + ((_data - 1 - 65533) << compact_alignment_log2)); + } + else if (_data == 65534) + return static_cast(compact_get_page(this, header_offset)->compact_shared_parent); + else + return compact_get_value(this); + } + else + return 0; + } + + T* operator->() const + { + return *this; + } + + private: + uint16_t _data; + }; + + template class compact_string + { + public: + compact_string(): _data(0) + { + } + + void operator=(const compact_string& rhs) + { + *this = rhs + 0; + } + + void operator=(char_t* value) + { + if (value) + { + xml_memory_page* page = compact_get_page(this, header_offset); + + if (PUGI__UNLIKELY(page->compact_string_base == 0)) + page->compact_string_base = value; + + ptrdiff_t offset = value - page->compact_string_base; + + if (static_cast(offset) < (65535 << 7)) + { + // round-trip through void* to silence 'cast increases required alignment of target type' warnings + uint16_t* base = reinterpret_cast(static_cast(reinterpret_cast(this) - base_offset)); + + if (*base == 0) + { + *base = static_cast((offset >> 7) + 1); + _data = static_cast((offset & 127) + 1); + } + else + { + ptrdiff_t remainder = offset - ((*base - 1) << 7); + + if (static_cast(remainder) <= 253) + { + _data = static_cast(remainder + 1); + } + else + { + compact_set_value(this, value); + + _data = 255; + } + } + } + else + { + compact_set_value(this, value); + + _data = 255; + } + } + else + { + _data = 0; + } + } + + operator char_t*() const + { + if (_data) + { + if (_data < 255) + { + xml_memory_page* page = compact_get_page(this, header_offset); + + // round-trip through void* to silence 'cast increases required alignment of target type' warnings + const uint16_t* base = reinterpret_cast(static_cast(reinterpret_cast(this) - base_offset)); + assert(*base); + + ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1); + + return page->compact_string_base + offset; + } + else + { + return compact_get_value(this); + } + } + else + return 0; + } + + private: + unsigned char _data; + }; +PUGI__NS_END +#endif + +#ifdef PUGIXML_COMPACT +namespace pugi +{ + struct xml_attribute_struct + { + xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0) + { + PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8); + } + + impl::compact_header header; + + uint16_t namevalue_base; + + impl::compact_string<4, 2> name; + impl::compact_string<5, 3> value; + + impl::compact_pointer prev_attribute_c; + impl::compact_pointer next_attribute; + }; + + struct xml_node_struct + { + xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type - 1), namevalue_base(0) + { + PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12); + } + + impl::compact_header header; + + uint16_t namevalue_base; + + impl::compact_string<4, 2> name; + impl::compact_string<5, 3> value; + + impl::compact_pointer_parent parent; + + impl::compact_pointer first_child; + + impl::compact_pointer prev_sibling_c; + impl::compact_pointer next_sibling; + + impl::compact_pointer first_attribute; + }; +} +#else namespace pugi { - /// A 'name=value' XML attribute structure. struct xml_attribute_struct { - /// Default ctor xml_attribute_struct(impl::xml_memory_page* page): header(reinterpret_cast(page)), name(0), value(0), prev_attribute_c(0), next_attribute(0) { } uintptr_t header; - char_t* name; ///< Pointer to attribute name. - char_t* value; ///< Pointer to attribute value. + char_t* name; + char_t* value; - xml_attribute_struct* prev_attribute_c; ///< Previous attribute (cyclic list) - xml_attribute_struct* next_attribute; ///< Next attribute + xml_attribute_struct* prev_attribute_c; + xml_attribute_struct* next_attribute; }; - /// An XML document tree node. struct xml_node_struct { - /// Default ctor - /// \param type - node type - xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(reinterpret_cast(page) | (type - 1)), parent(0), name(0), value(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): 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) { } uintptr_t header; - xml_node_struct* parent; ///< Pointer to parent + char_t* name; + char_t* value; - char_t* name; ///< Pointer to element name. - char_t* value; ///< Pointer to any associated string data. + xml_node_struct* parent; - xml_node_struct* first_child; ///< First child - - xml_node_struct* prev_sibling_c; ///< Left brother (cyclic list) - xml_node_struct* next_sibling; ///< Right brother - - xml_attribute_struct* first_attribute; ///< First attribute + xml_node_struct* first_child; + + xml_node_struct* prev_sibling_c; + xml_node_struct* next_sibling; + + xml_attribute_struct* first_attribute; }; } +#endif PUGI__NS_BEGIN struct xml_extra_buffer @@ -550,25 +1120,32 @@ { 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; xml_extra_buffer* extra_buffers; + + #ifdef PUGIXML_COMPACT + compact_hash_table hash; + #endif }; - inline xml_allocator& get_allocator(const xml_node_struct* node) + template inline xml_allocator& get_allocator(const Object* object) { - assert(node); + assert(object); - return *reinterpret_cast(node->header & xml_memory_page_pointer_mask)->allocator; + return *PUGI__GETPAGE(object)->allocator; } template inline xml_document_struct& get_document(const Object* object) { assert(object); - return *static_cast(reinterpret_cast(object->header & xml_memory_page_pointer_mask)->allocator); + return *static_cast(PUGI__GETPAGE(object)->allocator); } PUGI__NS_END @@ -577,7 +1154,8 @@ inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc) { xml_memory_page* page; - void* memory = alloc.allocate_memory(sizeof(xml_attribute_struct), page); + void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page); + if (!memory) return 0; return new (memory) xml_attribute_struct(page); } @@ -585,27 +1163,30 @@ inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type) { xml_memory_page* page; - void* memory = alloc.allocate_memory(sizeof(xml_node_struct), page); + void* memory = alloc.allocate_object(sizeof(xml_node_struct), page); + if (!memory) return 0; return new (memory) xml_node_struct(page, type); } inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc) { - uintptr_t header = a->header; + if (a->header & impl::xml_memory_page_name_allocated_mask) + alloc.deallocate_string(a->name); - if (header & impl::xml_memory_page_name_allocated_mask) alloc.deallocate_string(a->name); - if (header & impl::xml_memory_page_value_allocated_mask) alloc.deallocate_string(a->value); + if (a->header & impl::xml_memory_page_value_allocated_mask) + alloc.deallocate_string(a->value); - alloc.deallocate_memory(a, sizeof(xml_attribute_struct), reinterpret_cast(header & xml_memory_page_pointer_mask)); + alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a)); } inline void destroy_node(xml_node_struct* n, xml_allocator& alloc) { - uintptr_t header = n->header; + if (n->header & impl::xml_memory_page_name_allocated_mask) + alloc.deallocate_string(n->name); - if (header & impl::xml_memory_page_name_allocated_mask) alloc.deallocate_string(n->name); - if (header & impl::xml_memory_page_value_allocated_mask) alloc.deallocate_string(n->value); + if (n->header & impl::xml_memory_page_value_allocated_mask) + alloc.deallocate_string(n->value); for (xml_attribute_struct* attr = n->first_attribute; attr; ) { @@ -625,7 +1206,7 @@ child = next; } - alloc.deallocate_memory(n, sizeof(xml_node_struct), reinterpret_cast(header & xml_memory_page_pointer_mask)); + alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n)); } inline void append_node(xml_node_struct* child, xml_node_struct* node) @@ -797,6 +1378,8 @@ PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element) { + if (!alloc.reserve()) return 0; + xml_node_struct* child = allocate_node(alloc, type); if (!child) return 0; @@ -807,6 +1390,8 @@ PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc) { + if (!alloc.reserve()) return 0; + xml_attribute_struct* attr = allocate_attribute(alloc); if (!attr) return 0; @@ -1012,28 +1597,11 @@ } }; - template struct wchar_selector; - - template <> struct wchar_selector<2> - { - typedef uint16_t type; - typedef utf16_counter counter; - typedef utf16_writer writer; - }; - - template <> struct wchar_selector<4> + struct utf8_decoder { - typedef uint32_t type; - typedef utf32_counter counter; - typedef utf32_writer writer; - }; + typedef uint8_t type; - typedef wchar_selector::counter wchar_counter; - typedef wchar_selector::writer wchar_writer; - - template struct utf_decoder - { - static inline typename Traits::value_type decode_utf8_block(const uint8_t* data, size_t size, typename Traits::value_type result) + template static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits) { const uint8_t utf8_byte_mask = 0x3f; @@ -1094,29 +1662,34 @@ return result; } + }; - static inline typename Traits::value_type decode_utf16_block(const uint16_t* data, size_t size, typename Traits::value_type result) - { - const uint16_t* end = data + size; + template struct utf16_decoder + { + typedef uint16_t type; - while (data < end) + template static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits) + { + while (size) { - unsigned int lead = opt_swap::value ? endian_swap(*data) : *data; + uint16_t lead = opt_swap::value ? endian_swap(*data) : *data; // U+0000..U+D7FF if (lead < 0xD800) { result = Traits::low(result, lead); data += 1; + size -= 1; } // U+E000..U+FFFF else if (static_cast(lead - 0xE000) < 0x2000) { result = Traits::low(result, lead); data += 1; + size -= 1; } // surrogate pair lead - else if (static_cast(lead - 0xD800) < 0x400 && data + 1 < end) + else if (static_cast(lead - 0xD800) < 0x400 && size >= 2) { uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1]; @@ -1124,26 +1697,32 @@ { result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff)); data += 2; + size -= 2; } else { data += 1; + size -= 1; } } else { data += 1; + size -= 1; } } return result; } + }; - static inline typename Traits::value_type decode_utf32_block(const uint32_t* data, size_t size, typename Traits::value_type result) - { - const uint32_t* end = data + size; + template struct utf32_decoder + { + typedef uint32_t type; - while (data < end) + template static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits) + { + while (size) { uint32_t lead = opt_swap::value ? endian_swap(*data) : *data; @@ -1152,53 +1731,76 @@ { result = Traits::low(result, lead); data += 1; + size -= 1; } // U+10000..U+10FFFF else { result = Traits::high(result, lead); data += 1; + size -= 1; } } return result; } + }; - static inline typename Traits::value_type decode_latin1_block(const uint8_t* data, size_t size, typename Traits::value_type result) + struct latin1_decoder + { + typedef uint8_t type; + + template static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits) { - for (size_t i = 0; i < size; ++i) + while (size) { - result = Traits::low(result, data[i]); + result = Traits::low(result, *data); + data += 1; + size -= 1; } return result; } + }; - static inline typename Traits::value_type decode_wchar_block_impl(const uint16_t* data, size_t size, typename Traits::value_type result) - { - return decode_utf16_block(data, size, result); - } + template struct wchar_selector; - static inline typename Traits::value_type decode_wchar_block_impl(const uint32_t* data, size_t size, typename Traits::value_type result) - { - return decode_utf32_block(data, size, result); - } + template <> struct wchar_selector<2> + { + typedef uint16_t type; + typedef utf16_counter counter; + typedef utf16_writer writer; + typedef utf16_decoder decoder; + }; - static inline typename Traits::value_type decode_wchar_block(const wchar_t* data, size_t size, typename Traits::value_type result) - { - return decode_wchar_block_impl(reinterpret_cast::type*>(data), size, result); - } + template <> struct wchar_selector<4> + { + typedef uint32_t type; + typedef utf32_counter counter; + typedef utf32_writer writer; + typedef utf32_decoder decoder; }; - template PUGI__FN void convert_utf_endian_swap(T* result, const T* data, size_t length) + typedef wchar_selector::counter wchar_counter; + typedef wchar_selector::writer wchar_writer; + + struct wchar_decoder { - for (size_t i = 0; i < length; ++i) result[i] = endian_swap(data[i]); - } + typedef wchar_t type; + + template static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits) + { + typedef wchar_selector::decoder decoder; + + return decoder::process(reinterpret_cast(data), size, result, traits); + } + }; #ifdef PUGIXML_WCHAR_MODE PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length) { - for (size_t i = 0; i < length; ++i) result[i] = static_cast(endian_swap(static_cast::type>(data[i]))); + for (size_t i = 0; i < length; ++i) + result[i] = static_cast(endian_swap(static_cast::type>(data[i]))); } #endif PUGI__NS_END @@ -1392,111 +1994,36 @@ out_buffer = buffer; out_length = length; } - else - { - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - convert_wchar_endian_swap(buffer, data, length); - buffer[length] = 0; - - out_buffer = buffer; - out_length = length + 1; - } - - return true; - } - - PUGI__FN bool convert_buffer_utf8(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size) - { - const uint8_t* data = static_cast(contents); - size_t data_length = size; - - // first pass: get length in wchar_t units - size_t length = utf_decoder::decode_utf8_block(data, data_length, 0); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf8 input to wchar_t - wchar_writer::value_type obegin = reinterpret_cast(buffer); - wchar_writer::value_type oend = utf_decoder::decode_utf8_block(data, data_length, obegin); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - template PUGI__FN bool convert_buffer_utf16(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, opt_swap) - { - const uint16_t* data = static_cast(contents); - size_t data_length = size / sizeof(uint16_t); - - // first pass: get length in wchar_t units - size_t length = utf_decoder::decode_utf16_block(data, data_length, 0); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf16 input to wchar_t - wchar_writer::value_type obegin = reinterpret_cast(buffer); - wchar_writer::value_type oend = utf_decoder::decode_utf16_block(data, data_length, obegin); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - template PUGI__FN bool convert_buffer_utf32(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, opt_swap) - { - const uint32_t* data = static_cast(contents); - size_t data_length = size / sizeof(uint32_t); - - // first pass: get length in wchar_t units - size_t length = utf_decoder::decode_utf32_block(data, data_length, 0); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf32 input to wchar_t - wchar_writer::value_type obegin = reinterpret_cast(buffer); - wchar_writer::value_type oend = utf_decoder::decode_utf32_block(data, data_length, obegin); + else + { + char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); + if (!buffer) return false; - assert(oend == obegin + length); - *oend = 0; + convert_wchar_endian_swap(buffer, data, length); + buffer[length] = 0; - out_buffer = buffer; - out_length = length + 1; + out_buffer = buffer; + out_length = length + 1; + } return true; } - PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size) + template PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D) { - const uint8_t* data = static_cast(contents); - size_t data_length = size; + const typename D::type* data = static_cast(contents); + size_t data_length = size / sizeof(typename D::type); - // get length in wchar_t units - size_t length = data_length; + // first pass: get length in wchar_t units + size_t length = D::process(data, data_length, 0, wchar_counter()); // allocate buffer of suitable length char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); if (!buffer) return false; - // convert latin1 input to wchar_t + // second pass: convert utf16 input to wchar_t wchar_writer::value_type obegin = reinterpret_cast(buffer); - wchar_writer::value_type oend = utf_decoder::decode_latin1_block(data, data_length, obegin); + wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer()); assert(oend == obegin + length); *oend = 0; @@ -1513,13 +2040,16 @@ xml_encoding wchar_encoding = get_wchar_encoding(); // fast path: no conversion required - if (encoding == wchar_encoding) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); + if (encoding == wchar_encoding) + return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); // only endian-swapping is required - if (need_endian_swap_utf(encoding, wchar_encoding)) return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable); + if (need_endian_swap_utf(encoding, wchar_encoding)) + return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable); // source encoding is utf8 - if (encoding == encoding_utf8) return convert_buffer_utf8(out_buffer, out_length, contents, size); + if (encoding == encoding_utf8) + return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder()); // source encoding is utf16 if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) @@ -1527,8 +2057,8 @@ xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; return (native_encoding == encoding) ? - convert_buffer_utf16(out_buffer, out_length, contents, size, opt_false()) : - convert_buffer_utf16(out_buffer, out_length, contents, size, opt_true()); + convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()) : + convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()); } // source encoding is utf32 @@ -1537,24 +2067,25 @@ xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; return (native_encoding == encoding) ? - convert_buffer_utf32(out_buffer, out_length, contents, size, opt_false()) : - convert_buffer_utf32(out_buffer, out_length, contents, size, opt_true()); + convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()) : + convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()); } // source encoding is latin1 - if (encoding == encoding_latin1) return convert_buffer_latin1(out_buffer, out_length, contents, size); + if (encoding == encoding_latin1) + return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder()); assert(!"Invalid encoding"); return false; } #else - template PUGI__FN bool convert_buffer_utf16(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, opt_swap) + template PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D) { - const uint16_t* data = static_cast(contents); - size_t data_length = size / sizeof(uint16_t); + const typename D::type* data = static_cast(contents); + size_t data_length = size / sizeof(typename D::type); // first pass: get length in utf8 units - size_t length = utf_decoder::decode_utf16_block(data, data_length, 0); + size_t length = D::process(data, data_length, 0, utf8_counter()); // allocate buffer of suitable length char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); @@ -1562,32 +2093,7 @@ // second pass: convert utf16 input to utf8 uint8_t* obegin = reinterpret_cast(buffer); - uint8_t* oend = utf_decoder::decode_utf16_block(data, data_length, obegin); - - assert(oend == obegin + length); - *oend = 0; - - out_buffer = buffer; - out_length = length + 1; - - return true; - } - - template PUGI__FN bool convert_buffer_utf32(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, opt_swap) - { - const uint32_t* data = static_cast(contents); - size_t data_length = size / sizeof(uint32_t); - - // first pass: get length in utf8 units - size_t length = utf_decoder::decode_utf32_block(data, data_length, 0); - - // allocate buffer of suitable length - char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!buffer) return false; - - // second pass: convert utf32 input to utf8 - uint8_t* obegin = reinterpret_cast(buffer); - uint8_t* oend = utf_decoder::decode_utf32_block(data, data_length, obegin); + uint8_t* oend = D::process(data, data_length, obegin, utf8_writer()); assert(oend == obegin + length); *oend = 0; @@ -1623,7 +2129,7 @@ if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); // first pass: get length in utf8 units - size_t length = prefix_length + utf_decoder::decode_latin1_block(postfix, postfix_length, 0); + size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter()); // allocate buffer of suitable length char_t* buffer = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); @@ -1633,7 +2139,7 @@ memcpy(buffer, data, prefix_length); uint8_t* obegin = reinterpret_cast(buffer); - uint8_t* oend = utf_decoder::decode_latin1_block(postfix, postfix_length, obegin + prefix_length); + uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer()); assert(oend == obegin + length); *oend = 0; @@ -1647,7 +2153,8 @@ PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable) { // fast path: no conversion required - if (encoding == encoding_utf8) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); + if (encoding == encoding_utf8) + return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable); // source encoding is utf16 if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) @@ -1655,8 +2162,8 @@ xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; return (native_encoding == encoding) ? - convert_buffer_utf16(out_buffer, out_length, contents, size, opt_false()) : - convert_buffer_utf16(out_buffer, out_length, contents, size, opt_true()); + convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()) : + convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder()); } // source encoding is utf32 @@ -1665,12 +2172,13 @@ xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; return (native_encoding == encoding) ? - convert_buffer_utf32(out_buffer, out_length, contents, size, opt_false()) : - convert_buffer_utf32(out_buffer, out_length, contents, size, opt_true()); + convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()) : + convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder()); } // source encoding is latin1 - if (encoding == encoding_latin1) return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable); + if (encoding == encoding_latin1) + return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable); assert(!"Invalid encoding"); return false; @@ -1680,20 +2188,18 @@ PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length) { // get length in utf8 characters - return utf_decoder::decode_wchar_block(str, length, 0); + return wchar_decoder::process(str, length, 0, utf8_counter()); } PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length) { // convert to utf8 uint8_t* begin = reinterpret_cast(buffer); - uint8_t* end = utf_decoder::decode_wchar_block(str, length, begin); + uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer()); assert(begin + size == end); (void)!end; - - // zero-terminate - buffer[size] = 0; + (void)!size; } #ifndef PUGIXML_NO_STL @@ -1717,7 +2223,7 @@ const uint8_t* data = reinterpret_cast(str); // first pass: get length in wchar_t units - size_t length = utf_decoder::decode_utf8_block(data, size, 0); + size_t length = utf8_decoder::process(data, size, 0, wchar_counter()); // allocate resulting string std::basic_string result; @@ -1727,7 +2233,7 @@ if (length > 0) { wchar_writer::value_type begin = reinterpret_cast(&result[0]); - wchar_writer::value_type end = utf_decoder::decode_utf8_block(data, size, begin); + wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer()); assert(begin + length == end); (void)!end; @@ -1737,7 +2243,8 @@ } #endif - inline bool strcpy_insitu_allow(size_t length, uintptr_t header, uintptr_t header_mask, char_t* target) + template + inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target) { // never reuse shared memory if (header & xml_memory_page_contents_shared_mask) return false; @@ -1753,16 +2260,13 @@ return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2); } - PUGI__FN bool strcpy_insitu(char_t*& dest, uintptr_t& header, uintptr_t header_mask, const char_t* source) + template + PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length) { - assert(header); - - size_t source_length = strlength(source); - if (source_length == 0) { // empty string and null pointer are equivalent, so just deallocate old memory - xml_allocator* alloc = reinterpret_cast(header & xml_memory_page_pointer_mask)->allocator; + xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator; if (header & header_mask) alloc->deallocate_string(dest); @@ -1775,20 +2279,24 @@ else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest)) { // we can reuse old buffer, so just copy the new data (including zero terminator) - memcpy(dest, source, (source_length + 1) * sizeof(char_t)); + memcpy(dest, source, source_length * sizeof(char_t)); + dest[source_length] = 0; return true; } else { - xml_allocator* alloc = reinterpret_cast(header & xml_memory_page_pointer_mask)->allocator; + xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator; + + if (!alloc->reserve()) return false; // allocate new buffer char_t* buf = alloc->allocate_string(source_length + 1); if (!buf) return false; // copy the string (including zero terminator) - memcpy(buf, source, (source_length + 1) * sizeof(char_t)); + memcpy(buf, source, source_length * sizeof(char_t)); + buf[source_length] = 0; // deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures) if (header & header_mask) alloc->deallocate_string(dest); @@ -2312,11 +2820,17 @@ struct xml_parser { xml_allocator alloc; + xml_allocator* alloc_state; char_t* error_offset; xml_parse_status error_status; - xml_parser(const xml_allocator& alloc_): alloc(alloc_), error_offset(0), error_status(status_ok) + xml_parser(xml_allocator* alloc_): alloc(*alloc_), alloc_state(alloc_), error_offset(0), error_status(status_ok) + { + } + + ~xml_parser() { + *alloc_state = alloc; } // DOCTYPE consists of nested sections of the following possible types: @@ -2614,6 +3128,7 @@ { // store value and step over > cursor->value = value; + PUGI__POPNODE(); PUGI__ENDSEG(); @@ -2893,18 +3408,15 @@ static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk) { - // allocator object is a part of document object - xml_allocator& alloc_ = *static_cast(xmldoc); - // early-out for empty documents if (length == 0) return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element); // get last child of the root before parsing - xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c : 0; + xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0; // create parser on stack - xml_parser parser(alloc_); + xml_parser parser(static_cast(xmldoc)); // save last character and make buffer zero-terminated (speeds up parsing) char_t endch = buffer[length - 1]; @@ -2916,9 +3428,6 @@ // perform actual parsing parser.parse_tree(buffer_data, root, optmsk, endch); - // update allocator state - alloc_ = parser.alloc; - xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0); assert(result.offset >= 0 && static_cast(result.offset) <= length); @@ -2929,7 +3438,7 @@ return make_parse_result(status_unrecognized_tag, length - 1); // check if there are any element nodes parsed - xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling : root->first_child; + xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0; if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed)) return make_parse_result(status_no_document_element, length - 1); @@ -2973,6 +3482,30 @@ return encoding_utf8; } + template PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T) + { + PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type)); + + typename T::value_type end = D::process(reinterpret_cast(data), length, dest, T()); + + return static_cast(end - dest) * sizeof(*dest); + } + + template PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap) + { + PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type)); + + typename T::value_type end = D::process(reinterpret_cast(data), length, dest, T()); + + if (opt_swap) + { + for (typename T::value_type i = dest; i != end; ++i) + *i = endian_swap(*i); + } + + return static_cast(end - dest) * sizeof(*dest); + } + #ifdef PUGIXML_WCHAR_MODE PUGI__FN size_t get_valid_length(const char_t* data, size_t length) { @@ -2994,53 +3527,27 @@ // convert to utf8 if (encoding == encoding_utf8) - { - uint8_t* dest = r_u8; - uint8_t* end = utf_decoder::decode_wchar_block(data, length, dest); - - return static_cast(end - dest); - } + return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer()); // convert to utf16 if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) { - uint16_t* dest = r_u16; - - // convert to native utf16 - uint16_t* end = utf_decoder::decode_wchar_block(data, length, dest); - - // swap if necessary xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - if (native_encoding != encoding) convert_utf_endian_swap(dest, dest, static_cast(end - dest)); - - return static_cast(end - dest) * sizeof(uint16_t); + return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding); } // convert to utf32 if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) { - uint32_t* dest = r_u32; - - // convert to native utf32 - uint32_t* end = utf_decoder::decode_wchar_block(data, length, dest); - - // swap if necessary xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - if (native_encoding != encoding) convert_utf_endian_swap(dest, dest, static_cast(end - dest)); - - return static_cast(end - dest) * sizeof(uint32_t); + return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding); } // convert to latin1 if (encoding == encoding_latin1) - { - uint8_t* dest = r_u8; - uint8_t* end = utf_decoder::decode_wchar_block(data, length, dest); - - return static_cast(end - dest); - } + return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer()); assert(!"Invalid encoding"); return 0; @@ -3066,41 +3573,20 @@ { if (encoding == encoding_utf16_be || encoding == encoding_utf16_le) { - uint16_t* dest = r_u16; - - // convert to native utf16 - uint16_t* end = utf_decoder::decode_utf8_block(reinterpret_cast(data), length, dest); - - // swap if necessary xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be; - if (native_encoding != encoding) convert_utf_endian_swap(dest, dest, static_cast(end - dest)); - - return static_cast(end - dest) * sizeof(uint16_t); + return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding); } if (encoding == encoding_utf32_be || encoding == encoding_utf32_le) { - uint32_t* dest = r_u32; - - // convert to native utf32 - uint32_t* end = utf_decoder::decode_utf8_block(reinterpret_cast(data), length, dest); - - // swap if necessary xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be; - if (native_encoding != encoding) convert_utf_endian_swap(dest, dest, static_cast(end - dest)); - - return static_cast(end - dest) * sizeof(uint32_t); + return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding); } if (encoding == encoding_latin1) - { - uint8_t* dest = r_u8; - uint8_t* end = utf_decoder::decode_utf8_block(reinterpret_cast(data), length, dest); - - return static_cast(end - dest); - } + return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer()); assert(!"Invalid encoding"); return 0; @@ -3118,11 +3604,6 @@ PUGI__STATIC_ASSERT(bufcapacity >= 8); } - ~xml_buffered_writer() - { - flush(); - } - size_t flush() { flush(buffer, bufsize); @@ -3483,14 +3964,24 @@ } } - PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) + PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth) { const char_t* default_name = PUGIXML_TEXT(":anonymous"); for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute) { - writer.write(' '); - writer.write_string(a->name ? a->name : default_name); + if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes) + { + writer.write('\n'); + + text_output_indent(writer, indent, indent_length, depth + 1); + } + else + { + writer.write(' '); + } + + writer.write_string(a->name ? a->name + 0 : default_name); writer.write('=', '"'); if (a->value) @@ -3500,16 +3991,16 @@ } } - PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) + PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth) { const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name : default_name; + const char_t* name = node->name ? node->name + 0 : default_name; writer.write('<'); writer.write_string(name); if (node->first_attribute) - node_output_attributes(writer, node, flags); + node_output_attributes(writer, node, indent, indent_length, flags, depth); if (!node->first_child) { @@ -3528,7 +4019,7 @@ PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node) { const char_t* default_name = PUGIXML_TEXT(":anonymous"); - const char_t* name = node->name ? node->name : default_name; + const char_t* name = node->name ? node->name + 0 : default_name; writer.write('<', '/'); writer.write_string(name); @@ -3542,20 +4033,20 @@ switch (PUGI__NODETYPE(node)) { case node_pcdata: - text_output(writer, node->value ? node->value : PUGIXML_TEXT(""), ctx_special_pcdata, flags); + text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags); break; case node_cdata: - text_output_cdata(writer, node->value ? node->value : PUGIXML_TEXT("")); + text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT("")); break; case node_comment: - node_output_comment(writer, node->value ? node->value : PUGIXML_TEXT("")); + node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT("")); break; case node_pi: writer.write('<', '?'); - writer.write_string(node->name ? node->name : default_name); + writer.write_string(node->name ? node->name + 0 : default_name); if (node->value) { @@ -3568,8 +4059,8 @@ case node_declaration: writer.write('<', '?'); - writer.write_string(node->name ? node->name : default_name); - node_output_attributes(writer, node, flags); + writer.write_string(node->name ? node->name + 0 : default_name); + node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0); writer.write('?', '>'); break; @@ -3599,7 +4090,7 @@ PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth) { - size_t indent_length = ((flags & (format_indent | format_raw)) == format_indent) ? strlength(indent) : 0; + size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0; unsigned int indent_flags = indent_indent; xml_node_struct* node = root; @@ -3627,7 +4118,7 @@ { indent_flags = indent_newline | indent_indent; - if (node_output_start(writer, node, flags)) + if (node_output_start(writer, node, indent, indent_length, flags, depth)) { node = node->first_child; depth++; @@ -3746,7 +4237,8 @@ return true; } - PUGI__FN void node_copy_string(char_t*& dest, uintptr_t& header, uintptr_t header_mask, char_t* source, uintptr_t& source_header, xml_allocator* alloc) + template + PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc) { assert(!dest && (header & header_mask) == 0); @@ -3761,7 +4253,7 @@ source_header |= xml_memory_page_contents_shared_mask; } else - strcpy_insitu(dest, header, header_mask, source); + strcpy_insitu(dest, header, header_mask, source, strlength(source)); } } @@ -3827,6 +4319,15 @@ } } + PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa) + { + xml_allocator& alloc = get_allocator(da); + xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0; + + node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc); + node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc); + } + inline bool is_text_node(xml_node_struct* node) { xml_node_type type = PUGI__NODETYPE(node); @@ -3835,49 +4336,93 @@ } // get value with conversion functions - PUGI__FN int get_integer_base(const char_t* value) + template U string_to_integer(const char_t* value, U minneg, U maxpos) { + U result = 0; const char_t* s = value; while (PUGI__IS_CHARTYPE(*s, ct_space)) s++; - if (*s == '-') - s++; + bool negative = (*s == '-'); - return (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) ? 16 : 10; - } + s += (*s == '+' || *s == '-'); - PUGI__FN int get_value_int(const char_t* value, int def) - { - if (!value) return def; + bool overflow = false; + + if (s[0] == '0' && (s[1] | ' ') == 'x') + { + s += 2; - int base = get_integer_base(value); + // since overflow detection relies on length of the sequence skip leading zeros + while (*s == '0') + s++; - #ifdef PUGIXML_WCHAR_MODE - return static_cast(wcstol(value, 0, base)); - #else - return static_cast(strtol(value, 0, base)); - #endif - } + const char_t* start = s; - PUGI__FN unsigned int get_value_uint(const char_t* value, unsigned int def) - { - if (!value) return def; + for (;;) + { + if (static_cast(*s - '0') < 10) + result = result * 16 + (*s - '0'); + else if (static_cast((*s | ' ') - 'a') < 6) + result = result * 16 + ((*s | ' ') - 'a' + 10); + else + break; - int base = get_integer_base(value); + s++; + } - #ifdef PUGIXML_WCHAR_MODE - return static_cast(wcstoul(value, 0, base)); - #else - return static_cast(strtoul(value, 0, base)); - #endif + size_t digits = static_cast(s - start); + + overflow = digits > sizeof(U) * 2; + } + else + { + // since overflow detection relies on length of the sequence skip leading zeros + while (*s == '0') + s++; + + const char_t* start = s; + + for (;;) + { + if (static_cast(*s - '0') < 10) + result = result * 10 + (*s - '0'); + else + break; + + s++; + } + + size_t digits = static_cast(s - start); + + PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2); + + const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5; + const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6'; + const size_t high_bit = sizeof(U) * 8 - 1; + + overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit))); + } + + if (negative) + return (overflow || result > minneg) ? 0 - minneg : 0 - result; + else + return (overflow || result > maxpos) ? maxpos : result; } - PUGI__FN double get_value_double(const char_t* value, double def) + PUGI__FN int get_value_int(const char_t* value) { - if (!value) return def; + return string_to_integer(value, 0 - static_cast(INT_MIN), INT_MAX); + } + + PUGI__FN unsigned int get_value_uint(const char_t* value) + { + return string_to_integer(value, 0, UINT_MAX); + } + PUGI__FN double get_value_double(const char_t* value) + { #ifdef PUGIXML_WCHAR_MODE return wcstod(value, 0); #else @@ -3885,10 +4430,8 @@ #endif } - PUGI__FN float get_value_float(const char_t* value, float def) + PUGI__FN float get_value_float(const char_t* value) { - if (!value) return def; - #ifdef PUGIXML_WCHAR_MODE return static_cast(wcstod(value, 0)); #else @@ -3896,10 +4439,8 @@ #endif } - PUGI__FN bool get_value_bool(const char_t* value, bool def) + PUGI__FN bool get_value_bool(const char_t* value) { - if (!value) return def; - // only look at first char char_t first = *value; @@ -3908,117 +4449,153 @@ } #ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN long long get_value_llong(const char_t* value, long long def) + PUGI__FN long long get_value_llong(const char_t* value) { - if (!value) return def; - - int base = get_integer_base(value); + return string_to_integer(value, 0 - static_cast(LLONG_MIN), LLONG_MAX); + } - #ifdef PUGIXML_WCHAR_MODE - #ifdef PUGI__MSVC_CRT_VERSION - return _wcstoi64(value, 0, base); - #else - return wcstoll(value, 0, base); - #endif - #else - #ifdef PUGI__MSVC_CRT_VERSION - return _strtoi64(value, 0, base); - #else - return strtoll(value, 0, base); - #endif - #endif + PUGI__FN unsigned long long get_value_ullong(const char_t* value) + { + return string_to_integer(value, 0, ULLONG_MAX); } +#endif - PUGI__FN unsigned long long get_value_ullong(const char_t* value, unsigned long long def) + template + PUGI__FN char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative) { - if (!value) return def; + char_t* result = end - 1; + U rest = negative ? 0 - value : value; + + do + { + *result-- = static_cast('0' + (rest % 10)); + rest /= 10; + } + while (rest); - int base = get_integer_base(value); + assert(result >= begin); + (void)begin; - #ifdef PUGIXML_WCHAR_MODE - #ifdef PUGI__MSVC_CRT_VERSION - return _wcstoui64(value, 0, base); - #else - return wcstoull(value, 0, base); - #endif - #else - #ifdef PUGI__MSVC_CRT_VERSION - return _strtoui64(value, 0, base); - #else - return strtoull(value, 0, base); - #endif - #endif + *result = '-'; + + return result + !negative; } -#endif // set value with conversion functions - PUGI__FN bool set_value_buffer(char_t*& dest, uintptr_t& header, uintptr_t header_mask, char (&buf)[128]) + template + PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf) { #ifdef PUGIXML_WCHAR_MODE char_t wbuf[128]; - impl::widen_ascii(wbuf, buf); + assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0])); + + size_t offset = 0; + for (; buf[offset]; ++offset) wbuf[offset] = buf[offset]; - return strcpy_insitu(dest, header, header_mask, wbuf); + return strcpy_insitu(dest, header, header_mask, wbuf, offset); #else - return strcpy_insitu(dest, header, header_mask, buf); + return strcpy_insitu(dest, header, header_mask, buf, strlen(buf)); #endif } - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, int value) + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, int value) { - char buf[128]; - sprintf(buf, "%d", value); - - return set_value_buffer(dest, header, header_mask, buf); + 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); } - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, unsigned int value) + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, unsigned int value) { - char buf[128]; - sprintf(buf, "%u", 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 set_value_buffer(dest, header, header_mask, buf); + return strcpy_insitu(dest, header, header_mask, begin, end - begin); } - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, float value) + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value) { char buf[128]; sprintf(buf, "%.9g", value); - return set_value_buffer(dest, header, header_mask, buf); + return set_value_ascii(dest, header, header_mask, buf); } - - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, double value) + + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value) { char buf[128]; sprintf(buf, "%.17g", value); - return set_value_buffer(dest, header, header_mask, buf); + return set_value_ascii(dest, header, header_mask, buf); } - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, bool value) + 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")); + return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5); } #ifdef PUGIXML_HAS_LONG_LONG - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, long long value) + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, long long value) { - char buf[128]; - sprintf(buf, "%lld", value); - - return set_value_buffer(dest, header, header_mask, buf); + 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); } - PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, unsigned long long value) + template + PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, unsigned long long value) { - char buf[128]; - sprintf(buf, "%llu", value); - - return set_value_buffer(dest, header, header_mask, buf); + 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); } #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) + { + // check input buffer + if (!contents && size) return make_parse_result(status_io_error); + + // get actual encoding + xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size); + + // get private buffer + char_t* buffer = 0; + size_t length = 0; + + if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory); + + // delete original buffer if we performed a conversion + if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents); + + // grab onto buffer if it's our buffer, user is responsible for deallocating contents himself + if (own || buffer != contents) *out_buffer = buffer; + + // store buffer for offset_debug + doc->buffer = buffer; + + // parse + xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options); + + // remember encoding + res.encoding = buffer_encoding; + + return res; + } + // we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result) { @@ -4059,6 +4636,7 @@ return status_ok; } + // 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) { // We only need to zero-terminate if encoding conversion does not do it for us @@ -4083,34 +4661,23 @@ return size; } - PUGI__FN xml_parse_result load_file_impl(xml_document& doc, FILE* file, unsigned int options, xml_encoding encoding) + PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer) { if (!file) return make_parse_result(status_file_not_found); // get file size (can result in I/O errors) size_t size = 0; xml_parse_status size_status = get_file_size(file, size); - - if (size_status != status_ok) - { - fclose(file); - return make_parse_result(size_status); - } + 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 char* contents = static_cast(xml_memory::allocate(size + max_suffix_size)); - - if (!contents) - { - fclose(file); - return make_parse_result(status_out_of_memory); - } + if (!contents) return make_parse_result(status_out_of_memory); // read file in memory size_t read_size = fread(contents, 1, size, file); - fclose(file); if (read_size != size) { @@ -4119,8 +4686,8 @@ } xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size); - - return doc.load_buffer_inplace_own(contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding); + + return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer); } #ifndef PUGIXML_NO_STL @@ -4129,14 +4696,13 @@ static xml_stream_chunk* create() { void* memory = xml_memory::allocate(sizeof(xml_stream_chunk)); + if (!memory) return 0; return new (memory) xml_stream_chunk(); } - static void destroy(void* ptr) + static void destroy(xml_stream_chunk* chunk) { - xml_stream_chunk* chunk = static_cast(ptr); - // free chunk chain while (chunk) { @@ -4160,7 +4726,7 @@ template PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream& stream, void** out_buffer, size_t* out_size) { - buffer_holder chunks(0, xml_stream_chunk::destroy); + auto_deleter > chunks(0, xml_stream_chunk::destroy); // read file to a chunk list size_t total = 0; @@ -4196,7 +4762,7 @@ char* write = buffer; - for (xml_stream_chunk* chunk = static_cast*>(chunks.data); chunk; chunk = chunk->next) + for (xml_stream_chunk* chunk = chunks.data; chunk; chunk = chunk->next) { assert(write + chunk->size <= buffer + total); memcpy(write, chunk->data, chunk->size); @@ -4230,7 +4796,7 @@ size_t max_suffix_size = sizeof(char_t); // read stream data into memory (guard against stream exceptions with buffer holder) - buffer_holder buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate); + auto_deleter buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate); if (!buffer.data) return status_out_of_memory; stream.read(static_cast(buffer.data), static_cast(read_length)); @@ -4248,7 +4814,7 @@ return status_ok; } - template PUGI__FN xml_parse_result load_stream_impl(xml_document& doc, std::basic_istream& stream, unsigned int options, xml_encoding encoding) + template PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer) { void* buffer = 0; size_t size = 0; @@ -4270,7 +4836,7 @@ xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size); - return doc.load_buffer_inplace_own(buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding); + return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer); } #endif @@ -4295,6 +4861,9 @@ // second pass: convert to utf8 as_utf8_end(result, size, str, length); + // zero-terminate + result[size] = 0; + return result; } @@ -4325,44 +4894,24 @@ xml_writer_file writer(file); doc.save(writer, indent, flags, encoding); - int result = ferror(file); - - fclose(file); - - return result == 0; + return ferror(file) == 0; } - 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) + struct name_null_sentry { - // check input buffer - if (!contents && size) return make_parse_result(status_io_error); - - // get actual encoding - xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size); - - // get private buffer - char_t* buffer = 0; - size_t length = 0; + xml_node_struct* node; + char_t* name; - if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory); - - // delete original buffer if we performed a conversion - if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents); - - // store buffer for offset_debug - doc->buffer = buffer; - - // parse - xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options); - - // remember encoding - res.encoding = buffer_encoding; - - // grab onto buffer if it's our buffer, user is responsible for deallocating contents himself - if (own || buffer != contents) *out_buffer = buffer; + name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name) + { + node->name = 0; + } - return res; - } + ~name_null_sentry() + { + node->name = name; + } + }; PUGI__NS_END namespace pugi @@ -4490,43 +5039,43 @@ PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const { - return (_attr && _attr->value) ? _attr->value : def; + return (_attr && _attr->value) ? _attr->value + 0 : def; } PUGI__FN int xml_attribute::as_int(int def) const { - return impl::get_value_int(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_int(_attr->value) : def; } PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const { - return impl::get_value_uint(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_uint(_attr->value) : def; } PUGI__FN double xml_attribute::as_double(double def) const { - return impl::get_value_double(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_double(_attr->value) : def; } PUGI__FN float xml_attribute::as_float(float def) const { - return impl::get_value_float(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_float(_attr->value) : def; } PUGI__FN bool xml_attribute::as_bool(bool def) const { - return impl::get_value_bool(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_bool(_attr->value) : def; } #ifdef PUGIXML_HAS_LONG_LONG PUGI__FN long long xml_attribute::as_llong(long long def) const { - return impl::get_value_llong(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_llong(_attr->value) : def; } PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const { - return impl::get_value_ullong(_attr ? _attr->value : 0, def); + return (_attr && _attr->value) ? impl::get_value_ullong(_attr->value) : def; } #endif @@ -4537,12 +5086,12 @@ PUGI__FN const char_t* xml_attribute::name() const { - return (_attr && _attr->name) ? _attr->name : PUGIXML_TEXT(""); + return (_attr && _attr->name) ? _attr->name + 0 : PUGIXML_TEXT(""); } PUGI__FN const char_t* xml_attribute::value() const { - return (_attr && _attr->value) ? _attr->value : PUGIXML_TEXT(""); + return (_attr && _attr->value) ? _attr->value + 0 : PUGIXML_TEXT(""); } PUGI__FN size_t xml_attribute::hash_value() const @@ -4584,7 +5133,7 @@ set_value(rhs); return *this; } - + PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs) { set_value(rhs); @@ -4609,14 +5158,14 @@ { if (!_attr) return false; - return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs); + 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; - return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs); + return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)); } PUGI__FN bool xml_attribute::set_value(int rhs) @@ -4646,7 +5195,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(bool rhs) { if (!_attr) return false; @@ -4706,7 +5255,7 @@ PUGI__FN xml_node::iterator xml_node::begin() const { - return iterator(_root ? _root->first_child : 0, _root); + return iterator(_root ? _root->first_child + 0 : 0, _root); } PUGI__FN xml_node::iterator xml_node::end() const @@ -4716,7 +5265,7 @@ PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const { - return attribute_iterator(_root ? _root->first_attribute : 0, _root); + return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root); } PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const @@ -4776,7 +5325,7 @@ PUGI__FN const char_t* xml_node::name() const { - return (_root && _root->name) ? _root->name : PUGIXML_TEXT(""); + return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT(""); } PUGI__FN xml_node_type xml_node::type() const @@ -4786,7 +5335,7 @@ PUGI__FN const char_t* xml_node::value() const { - return (_root && _root->value) ? _root->value : PUGIXML_TEXT(""); + return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT(""); } PUGI__FN xml_node xml_node::child(const char_t* name_) const @@ -4835,6 +5384,39 @@ return xml_node(); } + PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const + { + xml_attribute_struct* hint = hint_._attr; + + // if hint is not an attribute of node, behavior is not defined + assert(!hint || (_root && impl::is_attribute_of(hint, _root))); + + if (!_root) return xml_attribute(); + + // optimistically search from hint up until the end + for (xml_attribute_struct* i = hint; i; i = i->next_attribute) + if (i->name && impl::strequal(name_, i->name)) + { + // update hint to maximize efficiency of searching for consecutive attributes + hint_._attr = i->next_attribute; + + return xml_attribute(i); + } + + // wrap around and search from the first attribute until the hint + // 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails + for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute) + if (j->name && impl::strequal(name_, j->name)) + { + // update hint to maximize efficiency of searching for consecutive attributes + hint_._attr = j->next_attribute; + + return xml_attribute(j); + } + + return xml_attribute(); + } + PUGI__FN xml_node xml_node::previous_sibling() const { if (!_root) return xml_node(); @@ -4863,7 +5445,7 @@ if (!_root) return PUGIXML_TEXT(""); for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling) - if (i->value && impl::is_text_node(i)) + if (impl::is_text_node(i) && i->value) return i->value; return PUGIXML_TEXT(""); @@ -4896,39 +5478,32 @@ PUGI__FN bool xml_node::set_name(const char_t* rhs) { - switch (type()) - { - case node_pi: - case node_declaration: - case node_element: - return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs); + xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null; - default: + if (type_ != node_element && type_ != node_pi && type_ != node_declaration) return false; - } + + 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) { - switch (type()) - { - case node_pi: - case node_cdata: - case node_pcdata: - case node_comment: - case node_doctype: - return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs); + xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null; - default: + if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype) return false; - } + + return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)); } PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_) { if (!impl::allow_insert_attribute(type())) return xml_attribute(); - xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); + + xml_attribute a(impl::allocate_attribute(alloc)); if (!a) return xml_attribute(); impl::append_attribute(a._attr, _root); @@ -4942,7 +5517,10 @@ { if (!impl::allow_insert_attribute(type())) return xml_attribute(); - xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); + + xml_attribute a(impl::allocate_attribute(alloc)); if (!a) return xml_attribute(); impl::prepend_attribute(a._attr, _root); @@ -4957,7 +5535,10 @@ if (!impl::allow_insert_attribute(type())) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); + + xml_attribute a(impl::allocate_attribute(alloc)); if (!a) return xml_attribute(); impl::insert_attribute_after(a._attr, attr._attr, _root); @@ -4972,7 +5553,10 @@ if (!impl::allow_insert_attribute(type())) return xml_attribute(); if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - xml_attribute a(impl::allocate_attribute(impl::get_allocator(_root))); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); + + xml_attribute a(impl::allocate_attribute(alloc)); if (!a) return xml_attribute(); impl::insert_attribute_before(a._attr, attr._attr, _root); @@ -4985,48 +5569,81 @@ PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto) { if (!proto) return xml_attribute(); + if (!impl::allow_insert_attribute(type())) return xml_attribute(); - xml_attribute result = append_attribute(proto.name()); - result.set_value(proto.value()); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); - return result; + xml_attribute a(impl::allocate_attribute(alloc)); + if (!a) return xml_attribute(); + + impl::append_attribute(a._attr, _root); + impl::node_copy_attribute(a._attr, proto._attr); + + return a; } PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto) { if (!proto) return xml_attribute(); + if (!impl::allow_insert_attribute(type())) return xml_attribute(); - xml_attribute result = prepend_attribute(proto.name()); - result.set_value(proto.value()); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); - return result; + xml_attribute a(impl::allocate_attribute(alloc)); + if (!a) return xml_attribute(); + + impl::prepend_attribute(a._attr, _root); + impl::node_copy_attribute(a._attr, proto._attr); + + return a; } PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr) { if (!proto) return xml_attribute(); + if (!impl::allow_insert_attribute(type())) return xml_attribute(); + if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - xml_attribute result = insert_attribute_after(proto.name(), attr); - result.set_value(proto.value()); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); - return result; + xml_attribute a(impl::allocate_attribute(alloc)); + if (!a) return xml_attribute(); + + impl::insert_attribute_after(a._attr, attr._attr, _root); + impl::node_copy_attribute(a._attr, proto._attr); + + return a; } PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr) { if (!proto) return xml_attribute(); + if (!impl::allow_insert_attribute(type())) return xml_attribute(); + if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute(); - xml_attribute result = insert_attribute_before(proto.name(), attr); - result.set_value(proto.value()); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_attribute(); - return result; + xml_attribute a(impl::allocate_attribute(alloc)); + if (!a) return xml_attribute(); + + impl::insert_attribute_before(a._attr, attr._attr, _root); + impl::node_copy_attribute(a._attr, proto._attr); + + return a; } PUGI__FN xml_node xml_node::append_child(xml_node_type type_) { if (!impl::allow_insert_child(type(), type_)) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + 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::append_node(n._root, _root); @@ -5039,8 +5656,11 @@ PUGI__FN xml_node xml_node::prepend_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(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); impl::prepend_node(n._root, _root); @@ -5054,8 +5674,11 @@ { if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node(); + + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); impl::insert_node_before(n._root, node._root); @@ -5069,8 +5692,11 @@ { if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node(); + + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + xml_node n(impl::allocate_node(alloc, type_)); if (!n) return xml_node(); impl::insert_node_after(n._root, node._root); @@ -5121,7 +5747,10 @@ xml_node_type type_ = proto.type(); if (!impl::allow_insert_child(type(), type_)) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + 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::append_node(n._root, _root); @@ -5135,7 +5764,10 @@ xml_node_type type_ = proto.type(); if (!impl::allow_insert_child(type(), type_)) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + 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); @@ -5150,7 +5782,10 @@ if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + 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::insert_node_after(n._root, node._root); @@ -5165,7 +5800,10 @@ if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node(); - xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); + 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::insert_node_before(n._root, node._root); @@ -5178,6 +5816,9 @@ { if (!impl::allow_move(*this, moved)) return xml_node(); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); + // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; @@ -5191,6 +5832,9 @@ { if (!impl::allow_move(*this, moved)) return xml_node(); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); + // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; @@ -5206,6 +5850,9 @@ if (!node._root || node._root->parent != _root) return xml_node(); if (moved._root == node._root) return xml_node(); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); + // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; @@ -5221,6 +5868,9 @@ if (!node._root || node._root->parent != _root) return xml_node(); if (moved._root == node._root) return xml_node(); + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return xml_node(); + // disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask; @@ -5240,8 +5890,11 @@ if (!_root || !a._attr) return false; if (!impl::is_attribute_of(a._attr, _root)) return false; + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return false; + impl::remove_attribute(a._attr, _root); - impl::destroy_attribute(a._attr, impl::get_allocator(_root)); + impl::destroy_attribute(a._attr, alloc); return true; } @@ -5255,8 +5908,11 @@ { if (!_root || !n._root || n._root->parent != _root) return false; + impl::xml_allocator& alloc = impl::get_allocator(_root); + if (!alloc.reserve()) return false; + impl::remove_node(n._root); - impl::destroy_node(n._root, impl::get_allocator(_root)); + impl::destroy_node(n._root, alloc); return true; } @@ -5279,23 +5935,15 @@ if (!extra) return impl::make_parse_result(status_out_of_memory); - // save name; name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level - char_t* rootname = _root->name; - _root->name = 0; - - // parse - char_t* buffer = 0; - xml_parse_result res = impl::load_buffer_impl(doc, _root, const_cast(contents), size, options, encoding, false, false, &buffer); - - // restore name - _root->name = rootname; - // add extra buffer to the list - extra->buffer = buffer; + extra->buffer = 0; extra->next = doc->extra_buffers; doc->extra_buffers = extra; - return res; + // name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level + impl::name_null_sentry sentry(_root); + + return impl::load_buffer_impl(doc, _root, const_cast(contents), size, options, encoding, false, false, &extra->buffer); } 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 @@ -5306,7 +5954,7 @@ if (i->name && impl::strequal(name_, i->name)) { 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 : PUGIXML_TEXT(""))) + if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT(""))) return xml_node(i); } @@ -5319,7 +5967,7 @@ 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 : PUGIXML_TEXT(""))) + if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT(""))) return xml_node(i); return xml_node(); @@ -5328,20 +5976,35 @@ #ifndef PUGIXML_NO_STL PUGI__FN string_t xml_node::path(char_t delimiter) const { - xml_node cursor = *this; // Make a copy. - - string_t result = cursor.name(); + if (!_root) return string_t(); + + size_t offset = 0; - while (cursor.parent()) + for (xml_node_struct* i = _root; i; i = i->parent) { - cursor = cursor.parent(); - - string_t temp = cursor.name(); - temp += delimiter; - temp += result; - result.swap(temp); + offset += (i != _root); + offset += i->name ? impl::strlength(i->name) : 0; + } + + string_t result; + result.resize(offset); + + for (xml_node_struct* j = _root; j; j = j->parent) + { + if (j != _root) + result[--offset] = delimiter; + + if (j->name && *j->name) + { + size_t length = impl::strlength(j->name); + + offset -= length; + memcpy(&result[offset], j->name, length * sizeof(char_t)); + } } + assert(offset == 0); + return result; } #endif @@ -5458,6 +6121,8 @@ impl::xml_buffered_writer buffered_writer(writer, encoding); impl::node_output(buffered_writer, _root, indent, flags, depth); + + buffered_writer.flush(); } #ifndef PUGIXML_NO_STL @@ -5568,49 +6233,49 @@ { xml_node_struct* d = _data(); - return (d && d->value) ? d->value : PUGIXML_TEXT(""); + return (d && d->value) ? d->value + 0 : PUGIXML_TEXT(""); } PUGI__FN const char_t* xml_text::as_string(const char_t* def) const { xml_node_struct* d = _data(); - return (d && d->value) ? d->value : def; + return (d && d->value) ? d->value + 0 : def; } PUGI__FN int xml_text::as_int(int def) const { xml_node_struct* d = _data(); - return impl::get_value_int(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_int(d->value) : def; } PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const { xml_node_struct* d = _data(); - return impl::get_value_uint(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_uint(d->value) : def; } PUGI__FN double xml_text::as_double(double def) const { xml_node_struct* d = _data(); - return impl::get_value_double(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_double(d->value) : def; } PUGI__FN float xml_text::as_float(float def) const { xml_node_struct* d = _data(); - return impl::get_value_float(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_float(d->value) : def; } PUGI__FN bool xml_text::as_bool(bool def) const { xml_node_struct* d = _data(); - return impl::get_value_bool(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_bool(d->value) : def; } #ifdef PUGIXML_HAS_LONG_LONG @@ -5618,14 +6283,14 @@ { xml_node_struct* d = _data(); - return impl::get_value_llong(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_llong(d->value) : def; } PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const { xml_node_struct* d = _data(); - return impl::get_value_ullong(d ? d->value : 0, def); + return (d && d->value) ? impl::get_value_ullong(d->value) : def; } #endif @@ -5633,7 +6298,7 @@ { xml_node_struct* dn = _data_new(); - return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false; + return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false; } PUGI__FN bool xml_text::set(int rhs) @@ -6014,8 +6679,14 @@ { assert(!_root); + #ifdef PUGIXML_COMPACT + const size_t page_offset = sizeof(uint32_t); + #else + const size_t page_offset = 0; + #endif + // initialize sentinel page - PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + impl::xml_memory_page_alignment - sizeof(void*) <= sizeof(_memory)); + 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)); @@ -6026,8 +6697,15 @@ page->busy_size = impl::xml_memory_page_size; + // setup first page marker + #ifdef PUGIXML_COMPACT + // round-trip through void* to avoid 'cast increases required alignment of target type' warning + page->compact_page_marker = reinterpret_cast(static_cast(reinterpret_cast(page) + sizeof(impl::xml_memory_page))); + *page->compact_page_marker = sizeof(impl::xml_memory_page); + #endif + // allocate new root - _root = new (reinterpret_cast(page) + sizeof(impl::xml_memory_page)) impl::xml_document_struct(page); + _root = new (reinterpret_cast(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page); _root->prev_sibling_c = _root; // setup sentinel page @@ -6055,7 +6733,7 @@ } // destroy dynamic storage, leave sentinel page (it's in static memory) - impl::xml_memory_page* root_page = reinterpret_cast(_root->header & impl::xml_memory_page_pointer_mask); + impl::xml_memory_page* root_page = PUGI__GETPAGE(_root); assert(root_page && !root_page->prev); assert(reinterpret_cast(root_page) >= _memory && reinterpret_cast(root_page) < _memory + sizeof(_memory)); @@ -6068,6 +6746,11 @@ page = next; } + #ifdef PUGIXML_COMPACT + // destroy hash table + static_cast(_root)->hash.clear(); + #endif + _root = 0; } @@ -6076,14 +6759,14 @@ { reset(); - return impl::load_stream_impl(*this, stream, options, encoding); + return impl::load_stream_impl(static_cast(_root), stream, options, encoding, &_buffer); } PUGI__FN xml_parse_result xml_document::load(std::basic_istream >& stream, unsigned int options) { reset(); - return impl::load_stream_impl(*this, stream, options, encoding_wchar); + return impl::load_stream_impl(static_cast(_root), stream, options, encoding_wchar, &_buffer); } #endif @@ -6108,18 +6791,20 @@ { reset(); - FILE* file = fopen(path_, "rb"); + using impl::auto_deleter; // MSVC7 workaround + auto_deleter file(fopen(path_, "rb"), fclose); - return impl::load_file_impl(*this, file, options, encoding); + return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); } PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding) { reset(); - FILE* file = impl::open_file_wide(path_, L"rb"); + using impl::auto_deleter; // MSVC7 workaround + auto_deleter file(impl::open_file_wide(path_, L"rb"), fclose); - return impl::load_file_impl(*this, file, options, encoding); + return impl::load_file_impl(static_cast(_root), file.data, options, encoding, &_buffer); } PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding) @@ -6167,6 +6852,8 @@ } impl::node_output(buffered_writer, _root, indent, flags, 0); + + buffered_writer.flush(); } #ifndef PUGIXML_NO_STL @@ -6187,14 +6874,18 @@ PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const { - FILE* file = fopen(path_, (flags & format_save_file_text) ? "w" : "wb"); - return impl::save_file_impl(*this, file, indent, flags, encoding); + using impl::auto_deleter; // MSVC7 workaround + auto_deleter file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), fclose); + + return impl::save_file_impl(*this, file.data, indent, flags, encoding); } PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const { - FILE* file = impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"); - return impl::save_file_impl(*this, file, indent, flags, encoding); + using impl::auto_deleter; // MSVC7 workaround + auto_deleter file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), fclose); + + return impl::save_file_impl(*this, file.data, indent, flags, encoding); } PUGI__FN xml_node xml_document::document_element() const @@ -6523,18 +7214,26 @@ // Allocator used for AST and evaluation stacks PUGI__NS_BEGIN + static const size_t xpath_memory_page_size = + #ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE + PUGIXML_MEMORY_XPATH_PAGE_SIZE + #else + 4096 + #endif + ; + + 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; - char data[ - #ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE - PUGIXML_MEMORY_XPATH_PAGE_SIZE - #else - 4096 - #endif - ]; + union + { + char data[xpath_memory_page_size]; + double alignment; + }; }; class xpath_allocator @@ -6556,12 +7255,12 @@ void* allocate_nothrow(size_t size) { - // align size so that we're able to store pointers in subsequent blocks - size = (size + sizeof(void*) - 1) & ~(sizeof(void*) - 1); + // round size up to block alignment boundary + size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); if (_root_size + size <= _root->capacity) { - void* buf = _root->data + _root_size; + void* buf = &_root->data[0] + _root_size; _root_size += size; return buf; } @@ -6606,12 +7305,12 @@ void* reallocate(void* ptr, size_t old_size, size_t new_size) { - // align size so that we're able to store pointers in subsequent blocks - old_size = (old_size + sizeof(void*) - 1) & ~(sizeof(void*) - 1); - new_size = (new_size + sizeof(void*) - 1) & ~(sizeof(void*) - 1); + // round size up to block alignment boundary + old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); + new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1); // we can only reallocate the last object - assert(ptr == 0 || static_cast(ptr) + old_size == _root->data + _root_size); + assert(ptr == 0 || static_cast(ptr) + old_size == &_root->data[0] + _root_size); // adjust root size so that we have not allocated the object at all bool only_object = (_root_size == old_size); @@ -7346,7 +8045,7 @@ #ifdef PUGIXML_WCHAR_MODE return wcstod(string, 0); #else - return atof(string); + return strtod(string, 0); #endif } @@ -7587,7 +8286,7 @@ struct xpath_variable_boolean: xpath_variable { - xpath_variable_boolean(): value(false) + xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false) { } @@ -7597,7 +8296,7 @@ struct xpath_variable_number: xpath_variable { - xpath_variable_number(): value(0) + xpath_variable_number(): xpath_variable(xpath_type_number), value(0) { } @@ -7607,7 +8306,7 @@ struct xpath_variable_string: xpath_variable { - xpath_variable_string(): value(0) + xpath_variable_string(): xpath_variable(xpath_type_string), value(0) { } @@ -7622,6 +8321,10 @@ struct xpath_variable_node_set: xpath_variable { + xpath_variable_node_set(): xpath_variable(xpath_type_node_set) + { + } + xpath_node_set value; char_t name[1]; }; @@ -7715,7 +8418,29 @@ } } - PUGI__FN xpath_variable* get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end) + PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs) + { + switch (rhs->type()) + { + case xpath_type_node_set: + return lhs->set(static_cast(rhs)->value); + + case xpath_type_number: + return lhs->set(static_cast(rhs)->value); + + case xpath_type_string: + return lhs->set(static_cast(rhs)->value); + + case xpath_type_boolean: + return lhs->set(static_cast(rhs)->value); + + default: + assert(!"Invalid variable type"); + return false; + } + } + + PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result) { size_t length = static_cast(end - begin); char_t* scratch = buffer; @@ -7724,19 +8449,19 @@ { // need to make dummy on-heap copy scratch = static_cast(xml_memory::allocate((length + 1) * sizeof(char_t))); - if (!scratch) return 0; + if (!scratch) return false; } // copy string to zero-terminated buffer and perform lookup memcpy(scratch, begin, length * sizeof(char_t)); scratch[length] = 0; - xpath_variable* result = set->get(scratch); + *out_result = set->get(scratch); // free dummy buffer if (scratch != buffer) xml_memory::deallocate(scratch); - return result; + return true; } PUGI__NS_END @@ -8715,7 +9440,7 @@ { assert(a); - const char_t* name = a->name ? a->name : PUGIXML_TEXT(""); + const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT(""); switch (_test) { @@ -9898,6 +10623,11 @@ if (_right) _right->optimize(alloc); if (_next) _next->optimize(alloc); + optimize_self(alloc); + } + + void optimize_self(xpath_allocator* alloc) + { // Rewrite [position()=expr] with [expr] // Note that this step has to go before classification to recognize [position()=1] if ((_type == ast_filter || _type == ast_predicate) && @@ -10309,7 +11039,9 @@ if (!_variables) throw_error("Unknown variable: variable set is not provided"); - xpath_variable* var = get_variable_scratch(_scratch, _variables, name.begin, name.end); + xpath_variable* var = 0; + if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var)) + throw_error_oom(); if (!var) throw_error("Unknown variable: variable set does not contain the given name"); @@ -10845,19 +11577,18 @@ static xpath_query_impl* create() { void* memory = xml_memory::allocate(sizeof(xpath_query_impl)); + if (!memory) return 0; return new (memory) xpath_query_impl(); } - static void destroy(void* ptr) + static void destroy(xpath_query_impl* impl) { - if (!ptr) return; - // free all allocated pages - static_cast(ptr)->alloc.release(); + impl->alloc.release(); // free allocator memory (with the first page) - xml_memory::deallocate(ptr); + xml_memory::deallocate(impl); } xpath_query_impl(): root(0), alloc(&block) @@ -10986,7 +11717,7 @@ } #endif - PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_) + PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_) { assert(begin_ <= end_); @@ -11002,6 +11733,7 @@ _begin = &_storage; _end = &_storage + size_; + _type = type_; } else { @@ -11025,37 +11757,71 @@ // finalize _begin = storage; _end = storage + size_; + _type = type_; } } +#if __cplusplus >= 201103 + PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) + { + _type = rhs._type; + _storage = rhs._storage; + _begin = (rhs._begin == &rhs._storage) ? &_storage : rhs._begin; + _end = _begin + (rhs._end - rhs._begin); + + rhs._type = type_unsorted; + rhs._begin = &rhs._storage; + rhs._end = rhs._begin; + } +#endif + PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(&_storage), _end(&_storage) { } - PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_), _begin(&_storage), _end(&_storage) + PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(&_storage), _end(&_storage) { - _assign(begin_, end_); + _assign(begin_, end_, type_); } PUGI__FN xpath_node_set::~xpath_node_set() { - if (_begin != &_storage) impl::xml_memory::deallocate(_begin); + if (_begin != &_storage) + impl::xml_memory::deallocate(_begin); } - PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(ns._type), _begin(&_storage), _end(&_storage) + 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); + _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; - - _type = ns._type; - _assign(ns._begin, ns._end); + + _assign(ns._begin, ns._end, ns._type); + + return *this; + } + +#if __cplusplus >= 201103 + PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs): _type(type_unsorted), _begin(&_storage), _end(&_storage) + { + _move(rhs); + } + + PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) + { + if (this == &rhs) return *this; + + if (_begin != &_storage) + impl::xml_memory::deallocate(_begin); + + _move(rhs); return *this; } +#endif PUGI__FN xpath_node_set::type_t xpath_node_set::type() const { @@ -11112,7 +11878,7 @@ return error ? error : "No error"; } - PUGI__FN xpath_variable::xpath_variable(): _type(xpath_type_none), _next(0) + PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0) { } @@ -11211,27 +11977,80 @@ PUGI__FN xpath_variable_set::xpath_variable_set() { - for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) _data[i] = 0; + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + _data[i] = 0; } PUGI__FN xpath_variable_set::~xpath_variable_set() { for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + _destroy(_data[i]); + } + + PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs) + { + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + _data[i] = 0; + + _assign(rhs); + } + + PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs) + { + if (this == &rhs) return *this; + + _assign(rhs); + + return *this; + } + +#if __cplusplus >= 201103 + PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) + { + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) { - xpath_variable* var = _data[i]; + _data[i] = rhs._data[i]; + rhs._data[i] = 0; + } + } - while (var) - { - xpath_variable* next = var->_next; + PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) + { + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + { + _destroy(_data[i]); - impl::delete_xpath_variable(var->_type, var); + _data[i] = rhs._data[i]; + rhs._data[i] = 0; + } - var = next; - } + return *this; + } +#endif + + PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs) + { + xpath_variable_set temp; + + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i])) + return; + + _swap(temp); + } + + PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs) + { + for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) + { + xpath_variable* chain = _data[i]; + + _data[i] = rhs._data[i]; + rhs._data[i] = chain; } } - PUGI__FN xpath_variable* xpath_variable_set::find(const char_t* name) const + PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const { const size_t hash_size = sizeof(_data) / sizeof(_data[0]); size_t hash = impl::hash_string(name) % hash_size; @@ -11244,6 +12063,45 @@ return 0; } + PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result) + { + xpath_variable* last = 0; + + while (var) + { + // allocate storage for new variable + xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name()); + if (!nvar) return false; + + // link the variable to the result immediately to handle failures gracefully + if (last) + last->_next = nvar; + else + *out_result = nvar; + + last = nvar; + + // copy the value; this can fail due to out-of-memory conditions + if (!impl::copy_xpath_variable(nvar, var)) return false; + + var = var->_next; + } + + return true; + } + + PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var) + { + while (var) + { + xpath_variable* next = var->_next; + + impl::delete_xpath_variable(var->_type, var); + + var = next; + } + } + PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type) { const size_t hash_size = sizeof(_data) / sizeof(_data[0]); @@ -11259,7 +12117,6 @@ if (result) { - result->_type = type; result->_next = _data[hash]; _data[hash] = result; @@ -11294,12 +12151,12 @@ PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name) { - return find(name); + return _find(name); } PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const { - return find(name); + return _find(name); } PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0) @@ -11316,7 +12173,8 @@ } else { - impl::buffer_holder impl_holder(qimpl, impl::xpath_query_impl::destroy); + using impl::auto_deleter; // MSVC7 workaround + auto_deleter impl(qimpl, impl::xpath_query_impl::destroy); qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result); @@ -11324,17 +12182,47 @@ { qimpl->root->optimize(&qimpl->alloc); - _impl = static_cast(impl_holder.release()); + _impl = impl.release(); _result.error = 0; } } } + PUGI__FN xpath_query::xpath_query(): _impl(0) + { + } + PUGI__FN xpath_query::~xpath_query() { - impl::xpath_query_impl::destroy(_impl); + if (_impl) + impl::xpath_query_impl::destroy(static_cast(_impl)); + } + +#if __cplusplus >= 201103 + PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) + { + _impl = rhs._impl; + _result = rhs._result; + rhs._impl = 0; + rhs._result = xpath_parse_result(); } + PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) + { + if (this == &rhs) return *this; + + if (_impl) + impl::xpath_query_impl::destroy(static_cast(_impl)); + + _impl = rhs._impl; + _result = rhs._result; + rhs._impl = 0; + rhs._result = xpath_parse_result(); + + return *this; + } +#endif + PUGI__FN xpath_value_type xpath_query::return_type() const { if (!_impl) return xpath_type_none; @@ -11510,6 +12398,8 @@ #undef PUGI__NS_END #undef PUGI__FN #undef PUGI__FN_NO_INLINE +#undef PUGI__GETPAGE_IMPL +#undef PUGI__GETPAGE #undef PUGI__NODETYPE #undef PUGI__IS_CHARTYPE_IMPL #undef PUGI__IS_CHARTYPE diff -Nru filezilla-3.14.1/src/pugixml/pugixml.hpp filezilla-3.15.0.2/src/pugixml/pugixml.hpp --- filezilla-3.14.1/src/pugixml/pugixml.hpp 2015-07-28 14:57:50.000000000 +0000 +++ filezilla-3.15.0.2/src/pugixml/pugixml.hpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.6 + * pugixml parser - version 1.7 * -------------------------------------------------------- * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at http://pugixml.org/ @@ -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 160 +# define PUGIXML_VERSION 170 #endif // Include user configuration file (this can define various configuration macros) @@ -65,7 +65,7 @@ // If the platform is known to have long long support, enable long long functions #ifndef PUGIXML_HAS_LONG_LONG -# if defined(__cplusplus) && __cplusplus >= 201103 +# if __cplusplus >= 201103 # define PUGIXML_HAS_LONG_LONG # elif defined(_MSC_VER) && _MSC_VER >= 1400 # define PUGIXML_HAS_LONG_LONG @@ -203,10 +203,13 @@ // Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default. const unsigned int format_save_file_text = 0x20; + // Write every attribute on a new line with appropriate indentation. This flag is off by default. + const unsigned int format_indent_attributes = 0x40; + // 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; - + // Forward declarations struct xml_attribute_struct; struct xml_node_struct; @@ -463,6 +466,9 @@ xml_node next_sibling(const char_t* name) const; xml_node previous_sibling(const char_t* name) const; + // Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast) + xml_attribute attribute(const char_t* name, xml_attribute& hint) const; + // Get child value of current node; that is, value of the first child node of type PCDATA/CDATA const char_t* child_value() const; @@ -939,7 +945,7 @@ // Non-copyable semantics xml_document(const xml_document&); - const xml_document& operator=(const xml_document&); + xml_document& operator=(const xml_document&); void create(); void destroy(); @@ -1040,7 +1046,7 @@ xpath_value_type _type; xpath_variable* _next; - xpath_variable(); + xpath_variable(xpath_value_type type); // Non-copyable semantics xpath_variable(const xpath_variable&); @@ -1072,17 +1078,29 @@ private: xpath_variable* _data[64]; - // Non-copyable semantics - xpath_variable_set(const xpath_variable_set&); - xpath_variable_set& operator=(const xpath_variable_set&); + void _assign(const xpath_variable_set& rhs); + void _swap(xpath_variable_set& rhs); + + xpath_variable* _find(const char_t* name) const; - xpath_variable* find(const char_t* name) const; + static bool _clone(xpath_variable* var, xpath_variable** out_result); + static void _destroy(xpath_variable* var); public: // Default constructor/destructor xpath_variable_set(); ~xpath_variable_set(); + // Copy constructor/assignment operator + xpath_variable_set(const xpath_variable_set& rhs); + xpath_variable_set& operator=(const xpath_variable_set& rhs); + + #if __cplusplus >= 201103 + // Move semantics support + xpath_variable_set(xpath_variable_set&& rhs); + xpath_variable_set& operator=(xpath_variable_set&& rhs); + #endif + // Add a new variable or get the existing one, if the types match xpath_variable* add(const char_t* name, xpath_value_type type); @@ -1115,9 +1133,18 @@ // If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors. explicit xpath_query(const char_t* query, xpath_variable_set* variables = 0); + // Constructor + xpath_query(); + // Destructor ~xpath_query(); + #if __cplusplus >= 201103 + // Move semantics support + xpath_query(xpath_query&& rhs); + xpath_query& operator=(xpath_query&& rhs); + #endif + // Get query expression return type xpath_value_type return_type() const; @@ -1253,6 +1280,12 @@ xpath_node_set(const xpath_node_set& ns); xpath_node_set& operator=(const xpath_node_set& ns); + #if __cplusplus >= 201103 + // Move semantics support + xpath_node_set(xpath_node_set&& rhs); + xpath_node_set& operator=(xpath_node_set&& rhs); + #endif + // Get collection type type_t type() const; @@ -1283,7 +1316,8 @@ xpath_node* _begin; xpath_node* _end; - void _assign(const_iterator begin, const_iterator end); + void _assign(const_iterator begin, const_iterator end, type_t type); + void _move(xpath_node_set& rhs); }; #endif diff -Nru filezilla-3.14.1/src/putty/be_misc.c filezilla-3.15.0.2/src/putty/be_misc.c --- filezilla-3.14.1/src/putty/be_misc.c 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/be_misc.c 2016-02-05 08:54:46.000000000 +0000 @@ -0,0 +1,111 @@ +/* + * be_misc.c: helper functions shared between main network backends. + */ + +#include +#include + +#define DEFINE_PLUG_METHOD_MACROS +#include "putty.h" +#include "network.h" + +void backend_socket_log(void *frontend, int type, SockAddr addr, int port, + const char *error_msg, int error_code, Conf *conf, + int session_started) +{ + char addrbuf[256], *msg; + + switch (type) { + case 0: + sk_getaddr(addr, addrbuf, lenof(addrbuf)); + if (sk_addr_needs_port(addr)) { + msg = dupprintf("Connecting to %s port %d", addrbuf, port); + } else { + msg = dupprintf("Connecting to %s", addrbuf); + } + break; + case 1: + sk_getaddr(addr, addrbuf, lenof(addrbuf)); + msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg); + break; + case 2: + /* Proxy-related log messages have their own identifying + * prefix already, put on by our caller. */ + { + int len, log_to_term; + + /* Suffix \r\n temporarily, so we can log to the terminal. */ + msg = dupprintf("%s\r\n", error_msg); + len = strlen(msg); + assert(len >= 2); + + log_to_term = conf_get_int(conf, CONF_proxy_log_to_term); + if (log_to_term == AUTO) + log_to_term = session_started ? FORCE_OFF : FORCE_ON; + if (log_to_term == FORCE_ON) + from_backend(frontend, TRUE, msg, len); + + msg[len-2] = '\0'; /* remove the \r\n again */ + } + break; + default: + msg = NULL; /* shouldn't happen, but placate optimiser */ + break; + } + + if (msg) { + logevent(frontend, msg); + sfree(msg); + } +} + +void log_proxy_stderr(Plug plug, bufchain *buf, const void *vdata, int len) +{ + const char *data = (const char *)vdata; + int pos = 0; + int msglen; + char *nlpos, *msg, *fullmsg; + + /* + * This helper function allows us to collect the data written to a + * local proxy command's standard error in whatever size chunks we + * happen to get from its pipe, and whenever we have a complete + * line, we pass it to plug_log. + * + * Prerequisites: a plug to log to, and a bufchain stored + * somewhere to collect the data in. + */ + + while (pos < len && (nlpos = memchr(data+pos, '\n', len-pos)) != NULL) { + /* + * Found a newline in the current input buffer. Append it to + * the bufchain (which may contain a partial line from last + * time). + */ + bufchain_add(buf, data + pos, nlpos - (data + pos)); + + /* + * Collect the resulting line of data and pass it to plug_log. + */ + msglen = bufchain_size(buf); + msg = snewn(msglen+1, char); + bufchain_fetch(buf, msg, msglen); + bufchain_consume(buf, msglen); + msg[msglen] = '\0'; + fullmsg = dupprintf("proxy: %s", msg); + plug_log(plug, 2, NULL, 0, fullmsg, 0); + sfree(fullmsg); + sfree(msg); + + /* + * Advance past the newline. + */ + pos += nlpos+1 - (data + pos); + } + + /* + * Now any remaining data is a partial line, which we save for + * next time. + */ + bufchain_add(buf, data + pos, len - pos); +} diff -Nru filezilla-3.14.1/src/putty/cmdgen.c filezilla-3.15.0.2/src/putty/cmdgen.c --- filezilla-3.14.1/src/putty/cmdgen.c 2015-09-04 11:41:18.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/cmdgen.c 2016-02-05 08:54:46.000000000 +0000 @@ -66,7 +66,7 @@ char* fingerprint = 0; printf("fzputtygen\n"); - printf("Copyright (C) 2008-2015 Tim Kosse\n"); + printf("Copyright (C) 2008-2016 Tim Kosse\n"); printf("Based on PuTTY's puttygen\n"); printf("Copyright (C) 1997-2015 Simon Tatham and the PuTTY team\n"); printf("Converts private SSH keys into PuTTY's format.\n"); diff -Nru filezilla-3.14.1/src/putty/cmdline.c filezilla-3.15.0.2/src/putty/cmdline.c --- filezilla-3.14.1/src/putty/cmdline.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/cmdline.c 2016-02-05 08:54:46.000000000 +0000 @@ -575,8 +575,19 @@ } } - if (!strcmp(p, "-sessionlog") || - !strcmp(p, "-sshlog") || + if (!strcmp(p, "-sessionlog")) { + Filename *fn; + RETURN(2); + UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER); + /* but available even in TOOLTYPE_NONNETWORK, cf pterm "-log" */ + SAVEABLE(0); + fn = filename_from_str(value); + conf_set_filename(conf, CONF_logfilename, fn); + conf_set_int(conf, CONF_logtype, LGTYP_DEBUG); + filename_free(fn); + } + + if (!strcmp(p, "-sshlog") || !strcmp(p, "-sshrawlog")) { Filename *fn; RETURN(2); @@ -585,7 +596,6 @@ fn = filename_from_str(value); conf_set_filename(conf, CONF_logfilename, fn); conf_set_int(conf, CONF_logtype, - !strcmp(p, "-sessionlog") ? LGTYP_DEBUG : !strcmp(p, "-sshlog") ? LGTYP_PACKETS : /* !strcmp(p, "-sshrawlog") ? */ LGTYP_SSHRAW); filename_free(fn); diff -Nru filezilla-3.14.1/src/putty/import.c filezilla-3.15.0.2/src/putty/import.c --- filezilla-3.14.1/src/putty/import.c 2015-08-10 15:12:27.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/import.c 2016-02-05 08:54:46.000000000 +0000 @@ -195,14 +195,16 @@ return -1; if (*p & 0x80) { + unsigned len; int n = *p & 0x7F; p++, sourcelen--; if (sourcelen < n) return -1; - *length = 0; + len = 0; while (n--) - *length = (*length << 8) | (*p++); + len = (len << 8) | (*p++); sourcelen -= n; + *length = toint(len); } else { *length = *p; p++, sourcelen--; @@ -383,8 +385,8 @@ goto error; } strip_crlf(line); - if (0 != strncmp(line, "-----BEGIN ", 11) || - 0 != strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { + if (!strstartswith(line, "-----BEGIN ") || + !strendswith(line, "PRIVATE KEY-----")) { errmsg = "file does not begin with OpenSSH key header"; goto error; } @@ -421,8 +423,8 @@ goto error; } strip_crlf(line); - if (0 == strncmp(line, "-----END ", 9) && - 0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { + if (strstartswith(line, "-----END ") && + strendswith(line, "PRIVATE KEY-----")) { sfree(line); line = NULL; break; /* done */ @@ -657,7 +659,8 @@ * decrypt, if the key was encrypted. */ ret = ber_read_id_len(p, key->keyblob_len, &id, &len, &flags); p += ret; - if (ret < 0 || id != 16) { + if (ret < 0 || id != 16 || len < 0 || + key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -683,8 +686,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 2 || key->keyblob+key->keyblob_len-p < len || - len != 1 || p[0] != 1) { + if (ret < 0 || id != 2 || len != 1 || + key->keyblob+key->keyblob_len-p < len || p[0] != 1) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -694,7 +697,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 4 || key->keyblob+key->keyblob_len-p < len) { + if (ret < 0 || id != 4 || len < 0 || + key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -706,7 +710,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 0 || key->keyblob+key->keyblob_len-p < len) { + if (ret < 0 || id != 0 || len < 0 || + key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -714,7 +719,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 6 || key->keyblob+key->keyblob_len-p < len) { + if (ret < 0 || id != 6 || len < 0 || + key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -730,7 +736,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 1 || key->keyblob+key->keyblob_len-p < len) { + if (ret < 0 || id != 1 || len < 0 || + key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; goto error; @@ -738,7 +745,8 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 3 || key->keyblob+key->keyblob_len-p < len || + if (ret < 0 || id != 3 || len < 0 || + key->keyblob+key->keyblob_len-p < len || len != ((((curve->fieldBits + 7) / 8) * 2) + 2)) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; @@ -813,7 +821,7 @@ ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, &id, &len, &flags); p += ret; - if (ret < 0 || id != 2 || + if (ret < 0 || id != 2 || len < 0 || key->keyblob+key->keyblob_len-p < len) { errmsg = "ASN.1 decoding failure"; retval = key->encrypted ? SSH2_WRONG_PASSPHRASE : NULL; diff -Nru filezilla-3.14.1/src/putty/logging.c filezilla-3.15.0.2/src/putty/logging.c --- filezilla-3.14.1/src/putty/logging.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/logging.c 2016-02-05 08:54:46.000000000 +0000 @@ -164,6 +164,7 @@ { struct LogContext *ctx = (struct LogContext *)handle; struct tm tm; + FILE *fp; int mode; /* Prevent repeat calls */ @@ -183,10 +184,10 @@ conf_get_str(ctx->conf, CONF_host), conf_get_int(ctx->conf, CONF_port), &tm); - ctx->lgfp = f_open(ctx->currlogfilename, "r", FALSE); /* file already present? */ - if (ctx->lgfp) { + fp = f_open(ctx->currlogfilename, "r", FALSE); /* file already present? */ + if (fp) { int logxfovr = conf_get_int(ctx->conf, CONF_logxfovr); - fclose(ctx->lgfp); + fclose(fp); if (logxfovr != LGXF_ASK) { mode = ((logxfovr == LGXF_OVR) ? 2 : 1); } else diff -Nru filezilla-3.14.1/src/putty/Makefile.am filezilla-3.15.0.2/src/putty/Makefile.am --- filezilla-3.14.1/src/putty/Makefile.am 2015-09-03 11:14:03.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/Makefile.am 2016-02-05 08:54:46.000000000 +0000 @@ -33,6 +33,7 @@ bin_PROGRAMS = fzsftp fzputtygen fzsftp_SOURCES = \ + be_misc.c \ be_none.c \ callback.c \ cproxy.c \ diff -Nru filezilla-3.14.1/src/putty/Makefile.in filezilla-3.15.0.2/src/putty/Makefile.in --- filezilla-3.14.1/src/putty/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/Makefile.in 2016-02-10 19:38:52.000000000 +0000 @@ -160,28 +160,29 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am__fzsftp_SOURCES_DIST = be_none.c callback.c cproxy.c errsock.c \ - fzsftp.c portfwd.c proxy.c ssh.c sshccp.c sshcrc.c sshsha.c \ - sshshare.c sshdh.c sshcrcda.c sshzlib.c sshdss.c x11fwd.c \ - wildcard.c pinger.c ssharcf.c sftp.c int64.c logging.c psftp.c \ - cmdline.c timing.c version.c settings.c time.c pproxy.c +am__fzsftp_SOURCES_DIST = be_misc.c be_none.c callback.c cproxy.c \ + errsock.c fzsftp.c portfwd.c proxy.c ssh.c sshccp.c sshcrc.c \ + sshsha.c sshshare.c sshdh.c sshcrcda.c sshzlib.c sshdss.c \ + x11fwd.c wildcard.c pinger.c ssharcf.c sftp.c int64.c \ + 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) -am_fzsftp_OBJECTS = fzsftp-be_none.$(OBJEXT) fzsftp-callback.$(OBJEXT) \ - fzsftp-cproxy.$(OBJEXT) fzsftp-errsock.$(OBJEXT) \ - fzsftp-fzsftp.$(OBJEXT) fzsftp-portfwd.$(OBJEXT) \ - fzsftp-proxy.$(OBJEXT) fzsftp-ssh.$(OBJEXT) \ - fzsftp-sshccp.$(OBJEXT) fzsftp-sshcrc.$(OBJEXT) \ - fzsftp-sshsha.$(OBJEXT) fzsftp-sshshare.$(OBJEXT) \ - fzsftp-sshdh.$(OBJEXT) fzsftp-sshcrcda.$(OBJEXT) \ - fzsftp-sshzlib.$(OBJEXT) fzsftp-sshdss.$(OBJEXT) \ - fzsftp-x11fwd.$(OBJEXT) fzsftp-wildcard.$(OBJEXT) \ - fzsftp-pinger.$(OBJEXT) fzsftp-ssharcf.$(OBJEXT) \ - fzsftp-sftp.$(OBJEXT) fzsftp-int64.$(OBJEXT) \ - fzsftp-logging.$(OBJEXT) fzsftp-psftp.$(OBJEXT) \ - fzsftp-cmdline.$(OBJEXT) fzsftp-timing.$(OBJEXT) \ - fzsftp-version.$(OBJEXT) fzsftp-settings.$(OBJEXT) \ - $(am__objects_2) $(am__objects_3) +am_fzsftp_OBJECTS = fzsftp-be_misc.$(OBJEXT) fzsftp-be_none.$(OBJEXT) \ + fzsftp-callback.$(OBJEXT) fzsftp-cproxy.$(OBJEXT) \ + fzsftp-errsock.$(OBJEXT) fzsftp-fzsftp.$(OBJEXT) \ + fzsftp-portfwd.$(OBJEXT) fzsftp-proxy.$(OBJEXT) \ + fzsftp-ssh.$(OBJEXT) fzsftp-sshccp.$(OBJEXT) \ + fzsftp-sshcrc.$(OBJEXT) fzsftp-sshsha.$(OBJEXT) \ + fzsftp-sshshare.$(OBJEXT) fzsftp-sshdh.$(OBJEXT) \ + fzsftp-sshcrcda.$(OBJEXT) fzsftp-sshzlib.$(OBJEXT) \ + fzsftp-sshdss.$(OBJEXT) fzsftp-x11fwd.$(OBJEXT) \ + fzsftp-wildcard.$(OBJEXT) fzsftp-pinger.$(OBJEXT) \ + fzsftp-ssharcf.$(OBJEXT) fzsftp-sftp.$(OBJEXT) \ + fzsftp-int64.$(OBJEXT) fzsftp-logging.$(OBJEXT) \ + fzsftp-psftp.$(OBJEXT) fzsftp-cmdline.$(OBJEXT) \ + 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 \ @@ -343,6 +344,8 @@ 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@ @@ -487,11 +490,12 @@ tree234.c \ fzprintf.c -fzsftp_SOURCES = be_none.c callback.c cproxy.c errsock.c fzsftp.c \ - portfwd.c proxy.c ssh.c sshccp.c sshcrc.c sshsha.c sshshare.c \ - sshdh.c sshcrcda.c sshzlib.c sshdss.c x11fwd.c 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) +fzsftp_SOURCES = be_misc.c be_none.c callback.c cproxy.c errsock.c \ + fzsftp.c portfwd.c proxy.c ssh.c sshccp.c sshcrc.c sshsha.c \ + sshshare.c sshdh.c sshcrcda.c sshzlib.c sshdss.c x11fwd.c \ + 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) noinst_HEADERS = fzprintf.h \ fzsftp.h \ @@ -624,6 +628,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)/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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fzsftp-cmdline.Po@am__quote@ @@ -1003,6 +1008,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-tree234.obj `if test -f 'tree234.c'; then $(CYGPATH_W) 'tree234.c'; else $(CYGPATH_W) '$(srcdir)/tree234.c'; fi` +fzsftp-be_misc.o: be_misc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzsftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzsftp-be_misc.o -MD -MP -MF $(DEPDIR)/fzsftp-be_misc.Tpo -c -o fzsftp-be_misc.o `test -f 'be_misc.c' || echo '$(srcdir)/'`be_misc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzsftp-be_misc.Tpo $(DEPDIR)/fzsftp-be_misc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='be_misc.c' object='fzsftp-be_misc.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) $(fzsftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fzsftp-be_misc.o `test -f 'be_misc.c' || echo '$(srcdir)/'`be_misc.c + +fzsftp-be_misc.obj: be_misc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzsftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzsftp-be_misc.obj -MD -MP -MF $(DEPDIR)/fzsftp-be_misc.Tpo -c -o fzsftp-be_misc.obj `if test -f 'be_misc.c'; then $(CYGPATH_W) 'be_misc.c'; else $(CYGPATH_W) '$(srcdir)/be_misc.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzsftp-be_misc.Tpo $(DEPDIR)/fzsftp-be_misc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='be_misc.c' object='fzsftp-be_misc.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) $(fzsftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fzsftp-be_misc.obj `if test -f 'be_misc.c'; then $(CYGPATH_W) 'be_misc.c'; else $(CYGPATH_W) '$(srcdir)/be_misc.c'; fi` + fzsftp-be_none.o: be_none.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fzsftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fzsftp-be_none.o -MD -MP -MF $(DEPDIR)/fzsftp-be_none.Tpo -c -o fzsftp-be_none.o `test -f 'be_none.c' || echo '$(srcdir)/'`be_none.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fzsftp-be_none.Tpo $(DEPDIR)/fzsftp-be_none.Po diff -Nru filezilla-3.14.1/src/putty/misc.c filezilla-3.15.0.2/src/putty/misc.c --- filezilla-3.14.1/src/putty/misc.c 2015-08-22 09:28:48.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/misc.c 2016-02-05 08:54:46.000000000 +0000 @@ -412,7 +412,7 @@ size = 512; while (1) { -#ifdef _WINDOWS +#if defined _WINDOWS && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #endif #ifdef va_copy @@ -460,7 +460,7 @@ int size = 512, len = 0; while (fgets(ret + len, size - len, fp)) { len += strlen(ret + len); - if (ret[len-1] == '\n') + if (len > 0 && ret[len-1] == '\n') break; /* got a newline, we're done */ size = len + 512; ret = sresize(ret, size, char); @@ -1067,7 +1067,7 @@ void *get_ssh_string(int *datalen, const void **data, int *stringlen) { void *ret; - int len; + unsigned int len; if (*datalen < 4) return NULL; @@ -1090,3 +1090,14 @@ *data = (const char *)*data + 4; return TRUE; } + +int strstartswith(const char *s, const char *t) +{ + return !memcmp(s, t, strlen(t)); +} + +int strendswith(const char *s, const char *t) +{ + size_t slen = strlen(s), tlen = strlen(t); + return slen >= tlen && !strcmp(s + (slen - tlen), t); +} diff -Nru filezilla-3.14.1/src/putty/misc.h filezilla-3.15.0.2/src/putty/misc.h --- filezilla-3.14.1/src/putty/misc.h 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/misc.h 2016-02-05 08:54:46.000000000 +0000 @@ -52,6 +52,8 @@ char *fgetline(FILE *fp); char *chomp(char *str); +int strstartswith(const char *s, const char *t); +int strendswith(const char *s, const char *t); void base64_encode_atom(const unsigned char *data, int n, char *out); int base64_decode_atom(const char *atom, unsigned char *out); diff -Nru filezilla-3.14.1/src/putty/network.h filezilla-3.15.0.2/src/putty/network.h --- filezilla-3.14.1/src/putty/network.h 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/network.h 2016-02-05 08:54:46.000000000 +0000 @@ -58,6 +58,11 @@ * fatal error - we may well have other candidate addresses * to fall back to. When it _is_ fatal, the closing() * function will be called. + * - type==2 means that error_msg contains a line of generic + * logging information about setting up the connection. This + * will typically be a wodge of standard-error output from a + * proxy command, so the receiver should probably prefix it to + * indicate this. */ int (*closing) (Plug p, const char *error_msg, int error_code, int calling_back); @@ -100,7 +105,8 @@ Socket new_listener(const char *srcaddr, int port, Plug plug, int local_host_only, Conf *conf, int addressfamily); SockAddr name_lookup(const char *host, int port, char **canonicalname, - Conf *conf, int addressfamily); + Conf *conf, int addressfamily, void *frontend_for_logging, + const char *lookup_reason_for_logging); int proxy_for_destination (SockAddr addr, const char *hostname, int port, Conf *conf); @@ -211,42 +217,19 @@ */ Socket new_error_socket(const char *errmsg, Plug plug); -/********** SSL stuff **********/ +/* ---------------------------------------------------------------------- + * Functions defined outside the network code, which have to be + * declared in this header file rather than the main putty.h because + * they use types defined here. + */ /* - * This section is subject to change, but you get the general idea - * of what it will eventually look like. + * Exports from be_misc.c. */ - -typedef struct certificate *Certificate; -typedef struct our_certificate *Our_Certificate; - /* to be defined somewhere else, somehow */ - -typedef struct ssl_client_socket_function_table **SSL_Client_Socket; -typedef struct ssl_client_plug_function_table **SSL_Client_Plug; - -struct ssl_client_socket_function_table { - struct socket_function_table base; - void (*renegotiate) (SSL_Client_Socket s); - /* renegotiate the cipher spec */ -}; - -struct ssl_client_plug_function_table { - struct plug_function_table base; - int (*refuse_cert) (SSL_Client_Plug p, Certificate cert[]); - /* do we accept this certificate chain? If not, why not? */ - /* cert[0] is the server's certificate, cert[] is NULL-terminated */ - /* the last certificate may or may not be the root certificate */ - Our_Certificate(*client_cert) (SSL_Client_Plug p); - /* the server wants us to identify ourselves */ - /* may return NULL if we want anonymity */ -}; - -SSL_Client_Socket sk_ssl_client_over(Socket s, /* pre-existing (tcp) connection */ - SSL_Client_Plug p); - -#define sk_renegotiate(s) (((*s)->renegotiate) (s)) - -int recv_peek(Socket sk, char* buf, int len); +void backend_socket_log(void *frontend, int type, SockAddr addr, int port, + const char *error_msg, int error_code, Conf *conf, + int session_started); +typedef struct bufchain_tag bufchain; /* rest of declaration in misc.c */ +void log_proxy_stderr(Plug plug, bufchain *buf, const void *vdata, int len); #endif diff -Nru filezilla-3.14.1/src/putty/portfwd.c filezilla-3.15.0.2/src/putty/portfwd.c --- filezilla-3.14.1/src/putty/portfwd.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/portfwd.c 2016-02-05 08:54:46.000000000 +0000 @@ -443,7 +443,8 @@ /* * Try to find host. */ - addr = name_lookup(hostname, port, &dummy_realhost, conf, addressfamily); + addr = name_lookup(hostname, port, &dummy_realhost, conf, addressfamily, + NULL, NULL); if ((err = sk_addr_error(addr)) != NULL) { char *err_ret = dupstr(err); sk_addr_free(addr); diff -Nru filezilla-3.14.1/src/putty/proxy.c filezilla-3.15.0.2/src/putty/proxy.c --- filezilla-3.14.1/src/putty/proxy.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/proxy.c 2016-02-05 08:54:46.000000000 +0000 @@ -362,17 +362,42 @@ return 1; } +static char *dns_log_msg(const char *host, int addressfamily, + const char *reason) +{ + return dupprintf("Looking up host \"%s\"%s for %s", host, + (addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" : + addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" : + ""), reason); +} + SockAddr name_lookup(const char *host, int port, char **canonicalname, - Conf *conf, int addressfamily) + Conf *conf, int addressfamily, void *frontend, + const char *reason) { + char *logmsg; if (conf_get_int(conf, CONF_proxy_type) != PROXY_NONE && do_proxy_dns(conf) && proxy_for_destination(NULL, host, port, conf)) { + + if (frontend) { + logmsg = dupprintf("Leaving host lookup to proxy of \"%s\"" + " (for %s)", host, reason); + logevent(frontend, logmsg); + sfree(logmsg); + } + *canonicalname = dupstr(host); return sk_nonamelookup(host); - } + } else { + if (frontend) { + logmsg = dns_log_msg(host, addressfamily, reason); + logevent(frontend, logmsg); + sfree(logmsg); + } - return sk_namelookup(host, canonicalname, addressfamily); + return sk_namelookup(host, canonicalname, addressfamily); + } } Socket new_connection(SockAddr addr, const char *hostname, @@ -407,6 +432,7 @@ Proxy_Plug pplug; SockAddr proxy_addr; char *proxy_canonical_name; + const char *proxy_type; Socket sret; int type; @@ -439,23 +465,45 @@ type = conf_get_int(conf, CONF_proxy_type); if (type == PROXY_HTTP) { ret->negotiate = proxy_http_negotiate; + proxy_type = "HTTP"; } else if (type == PROXY_SOCKS4) { ret->negotiate = proxy_socks4_negotiate; + proxy_type = "SOCKS 4"; } else if (type == PROXY_SOCKS5) { ret->negotiate = proxy_socks5_negotiate; + proxy_type = "SOCKS 5"; } else if (type == PROXY_TELNET) { ret->negotiate = proxy_telnet_negotiate; + proxy_type = "Telnet"; } else { ret->error = "Proxy error: Unknown proxy method"; return (Socket) ret; } + { + char *logmsg = dupprintf("Will use %s proxy at %s:%d to connect" + " to %s:%d", proxy_type, + conf_get_str(conf, CONF_proxy_host), + conf_get_int(conf, CONF_proxy_port), + hostname, port); + plug_log(plug, 2, NULL, 0, logmsg, 0); + sfree(logmsg); + } + /* create the proxy plug to map calls from the actual * socket into our proxy socket layer */ pplug = snew(struct Plug_proxy_tag); pplug->fn = &plug_fn_table; pplug->proxy_socket = ret; + { + char *logmsg = dns_log_msg(conf_get_str(conf, CONF_proxy_host), + conf_get_int(conf, CONF_addressfamily), + "proxy"); + plug_log(plug, 2, NULL, 0, logmsg, 0); + sfree(logmsg); + } + /* look-up proxy */ proxy_addr = sk_namelookup(conf_get_str(conf, CONF_proxy_host), &proxy_canonical_name, @@ -468,6 +516,16 @@ } sfree(proxy_canonical_name); + { + char addrbuf[256], *logmsg; + sk_getaddr(addr, addrbuf, lenof(addrbuf)); + logmsg = dupprintf("Connecting to %s proxy at %s port %d", + proxy_type, addrbuf, + conf_get_int(conf, CONF_proxy_port)); + plug_log(plug, 2, NULL, 0, logmsg, 0); + sfree(logmsg); + } + /* create the actual socket we will be using, * connected to our proxy server and port. */ @@ -1454,6 +1512,39 @@ formatted_cmd = format_telnet_command(p->remote_addr, p->remote_port, p->conf); + { + /* + * Re-escape control chars in the command, for logging. + */ + char *reescaped = snewn(4*strlen(formatted_cmd) + 1, char); + const char *in; + char *out; + char *logmsg; + + for (in = formatted_cmd, out = reescaped; *in; in++) { + if (*in == '\n') { + *out++ = '\\'; *out++ = 'n'; + } else if (*in == '\r') { + *out++ = '\\'; *out++ = 'r'; + } else if (*in == '\t') { + *out++ = '\\'; *out++ = 't'; + } else if (*in == '\\') { + *out++ = '\\'; *out++ = '\\'; + } else if ((unsigned)(((unsigned char)*in) - 0x20) < + (0x7F-0x20)) { + *out++ = *in; + } else { + out += sprintf(out, "\\x%02X", (unsigned)*in & 0xFF); + } + } + *out = '\0'; + + logmsg = dupprintf("Sending Telnet proxy command: %s", reescaped); + plug_log(p->plug, 2, NULL, 0, logmsg, 0); + sfree(logmsg); + sfree(reescaped); + } + sk_write(p->sub_socket, formatted_cmd, strlen(formatted_cmd)); sfree(formatted_cmd); diff -Nru filezilla-3.14.1/src/putty/psftp.c filezilla-3.15.0.2/src/putty/psftp.c --- filezilla-3.14.1/src/putty/psftp.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/psftp.c 2016-02-05 08:54:46.000000000 +0000 @@ -2995,10 +2995,13 @@ printf(" -C enable compression\n"); printf(" -i key private key file for user authentication\n"); printf(" -noagent disable use of Pageant\n"); + printf(" -agent enable use of Pageant\n"); printf(" -hostkey aa:bb:cc:...\n"); printf(" manually specify a host key (may be repeated)\n"); - printf(" -agent enable use of Pageant\n"); printf(" -batch disable all interactive prompts\n"); + printf(" -sshlog file\n"); + printf(" -sshrawlog file\n"); + printf(" log protocol details to a file\n"); cleanup_exit(1); } diff -Nru filezilla-3.14.1/src/putty/putty.h filezilla-3.15.0.2/src/putty/putty.h --- filezilla-3.14.1/src/putty/putty.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/putty.h 2016-02-05 08:54:46.000000000 +0000 @@ -279,9 +279,9 @@ * three-way settings whose values are `always yes', `always * no', and `decide by some more complex automated means'. This * is true of line discipline options (local echo and line - * editing), proxy DNS, Close On Exit, and SSH server bug - * workarounds. Accordingly I supply a single enum here to deal - * with them all. + * editing), proxy DNS, proxy terminal logging, Close On Exit, and + * SSH server bug workarounds. Accordingly I supply a single enum + * here to deal with them all. */ FORCE_ON, FORCE_OFF, AUTO }; @@ -291,7 +291,7 @@ * Proxy types. */ PROXY_NONE, PROXY_SOCKS4, PROXY_SOCKS5, - PROXY_HTTP, PROXY_TELNET, PROXY_CMD + PROXY_HTTP, PROXY_TELNET, PROXY_CMD, PROXY_FUZZ }; enum { @@ -681,6 +681,7 @@ X(STR, NONE, proxy_username) \ X(STR, NONE, proxy_password) \ X(STR, NONE, proxy_telnet_command) \ + X(INT, NONE, proxy_log_to_term) \ /* SSH options */ \ X(STR, NONE, remote_cmd) \ X(STR, NONE, remote_cmd2) /* fallback if remote_cmd fails; never loaded or saved */ \ diff -Nru filezilla-3.14.1/src/putty/settings.c filezilla-3.15.0.2/src/putty/settings.c --- filezilla-3.14.1/src/putty/settings.c 2015-09-10 09:37:18.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/settings.c 2016-02-05 08:54:46.000000000 +0000 @@ -481,6 +481,7 @@ write_setting_s(sesskey, "ProxyUsername", conf_get_str(conf, CONF_proxy_username)); write_setting_s(sesskey, "ProxyPassword", conf_get_str(conf, CONF_proxy_password)); write_setting_s(sesskey, "ProxyTelnetCommand", conf_get_str(conf, CONF_proxy_telnet_command)); + write_setting_i(sesskey, "ProxyLogToTerm", conf_get_int(conf, CONF_proxy_log_to_term)); */ wmap(sesskey, "Environment", conf, CONF_environmt, TRUE); write_setting_s(sesskey, "UserName", conf_get_str(conf, CONF_username)); @@ -761,7 +762,8 @@ gpps(sesskey, "ProxyUsername", "", conf, CONF_proxy_username); gpps(sesskey, "ProxyPassword", "", conf, CONF_proxy_password); gpps(sesskey, "ProxyTelnetCommand", "connect %host %port\\n", - conf, CONF_proxy_telnet_command); + conf, CONF_proxy_telnet_command); + gppi(sesskey, "ProxyLogToTerm", FORCE_OFF, conf, CONF_proxy_log_to_term); } gppmap(sesskey, "Environment", conf, CONF_environmt); gpps(sesskey, "UserName", "", conf, CONF_username); diff -Nru filezilla-3.14.1/src/putty/sshbn.c filezilla-3.15.0.2/src/putty/sshbn.c --- filezilla-3.14.1/src/putty/sshbn.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshbn.c 2016-02-05 08:54:46.000000000 +0000 @@ -87,20 +87,17 @@ /* * Internal addition. Sets c = a - b, where 'a', 'b' and 'c' are all - * big-endian arrays of 'len' BignumInts. Returns a BignumInt carried - * off the top. + * big-endian arrays of 'len' BignumInts. Returns the carry off the + * top. */ -static BignumInt internal_add(const BignumInt *a, const BignumInt *b, - BignumInt *c, int len) +static BignumCarry internal_add(const BignumInt *a, const BignumInt *b, + BignumInt *c, int len) { int i; - BignumDblInt carry = 0; + BignumCarry carry = 0; - for (i = len-1; i >= 0; i--) { - carry += (BignumDblInt)a[i] + b[i]; - c[i] = (BignumInt)carry; - carry >>= BIGNUM_INT_BITS; - } + for (i = len-1; i >= 0; i--) + BignumADC(c[i], carry, a[i], b[i], carry); return (BignumInt)carry; } @@ -114,13 +111,10 @@ BignumInt *c, int len) { int i; - BignumDblInt carry = 1; + BignumCarry carry = 1; - for (i = len-1; i >= 0; i--) { - carry += (BignumDblInt)a[i] + (b[i] ^ BIGNUM_INT_MASK); - c[i] = (BignumInt)carry; - carry >>= BIGNUM_INT_BITS; - } + for (i = len-1; i >= 0; i--) + BignumADC(c[i], carry, a[i], ~b[i], carry); } /* @@ -184,7 +178,7 @@ int toplen = len/2, botlen = len - toplen; /* botlen is the bigger */ int midlen = botlen + 1; - BignumDblInt carry; + BignumCarry carry; #ifdef KARA_DEBUG int i; #endif @@ -313,9 +307,7 @@ i = 2*len - botlen - 2*midlen - 1; while (carry) { assert(i >= 0); - carry += c[i]; - c[i] = (BignumInt)carry; - carry >>= BIGNUM_INT_BITS; + BignumADC(c[i], carry, c[i], 0, carry); i--; } #ifdef KARA_DEBUG @@ -329,7 +321,6 @@ } else { int i; BignumInt carry; - BignumDblInt t; const BignumInt *ap, *bp; BignumInt *cp, *cps; @@ -342,11 +333,8 @@ for (cps = c + 2*len, ap = a + len; ap-- > a; cps--) { carry = 0; - for (cp = cps, bp = b + len; cp--, bp-- > b ;) { - t = (MUL_WORD(*ap, *bp) + carry) + *cp; - *cp = (BignumInt) t; - carry = (BignumInt)(t >> BIGNUM_INT_BITS); - } + for (cp = cps, bp = b + len; cp--, bp-- > b ;) + BignumMULADD2(carry, *cp, *ap, *bp, *cp, carry); *cp = carry; } } @@ -431,7 +419,6 @@ } else { int i; BignumInt carry; - BignumDblInt t; const BignumInt *ap, *bp; BignumInt *cp, *cps; @@ -444,11 +431,8 @@ for (cps = c + len, ap = a + len; ap-- > a; cps--) { carry = 0; - for (cp = cps, bp = b + len; bp--, cp-- > c ;) { - t = (MUL_WORD(*ap, *bp) + carry) + *cp; - *cp = (BignumInt) t; - carry = (BignumInt)(t >> BIGNUM_INT_BITS); - } + for (cp = cps, bp = b + len; bp--, cp-- > c ;) + BignumMULADD2(carry, *cp, *ap, *bp, *cp, carry); } } } @@ -519,120 +503,436 @@ { int word = 1 + (shift / BIGNUM_INT_BITS); int bshift = shift % BIGNUM_INT_BITS; - BignumDblInt addend; + BignumInt addendh, addendl; + BignumCarry carry; - addend = (BignumDblInt)n << bshift; + addendl = n << bshift; + addendh = (bshift == 0 ? 0 : n >> (BIGNUM_INT_BITS - bshift)); - while (addend) { + assert(word <= number[0]); + BignumADC(number[word], carry, number[word], addendl, 0); + word++; + if (!addendh && !carry) + return; + assert(word <= number[0]); + BignumADC(number[word], carry, number[word], addendh, carry); + word++; + while (carry) { assert(word <= number[0]); - addend += number[word]; - number[word] = (BignumInt) addend & BIGNUM_INT_MASK; - addend >>= BIGNUM_INT_BITS; + BignumADC(number[word], carry, number[word], 0, carry); word++; } } +static int bn_clz(BignumInt x) +{ + /* + * Count the leading zero bits in x. Equivalently, how far left + * would we need to shift x to make its top bit set? + * + * Precondition: x != 0. + */ + + /* FIXME: would be nice to put in some compiler intrinsics under + * ifdef here */ + int i, ret = 0; + for (i = BIGNUM_INT_BITS / 2; i != 0; i >>= 1) { + if ((x >> (BIGNUM_INT_BITS-i)) == 0) { + x <<= i; + ret += i; + } + } + return ret; +} + +static BignumInt reciprocal_word(BignumInt d) +{ + BignumInt dshort, recip, prodh, prodl; + int corrections; + + /* + * Input: a BignumInt value d, with its top bit set. + */ + assert(d >> (BIGNUM_INT_BITS-1) == 1); + + /* + * Output: a value, shifted to fill a BignumInt, which is strictly + * less than 1/(d+1), i.e. is an *under*-estimate (but by as + * little as possible within the constraints) of the reciprocal of + * any number whose first BIGNUM_INT_BITS bits match d. + * + * Ideally we'd like to _totally_ fill BignumInt, i.e. always + * return a value with the top bit set. Unfortunately we can't + * quite guarantee that for all inputs and also return a fixed + * exponent. So instead we take our reciprocal to be + * 2^(BIGNUM_INT_BITS*2-1) / d, so that it has the top bit clear + * only in the exceptional case where d takes exactly the maximum + * value BIGNUM_INT_MASK; in that case, the top bit is clear and + * the next bit down is set. + */ + + /* + * Start by computing a half-length version of the answer, by + * straightforward division within a BignumInt. + */ + dshort = (d >> (BIGNUM_INT_BITS/2)) + 1; + recip = (BIGNUM_TOP_BIT + dshort - 1) / dshort; + recip <<= BIGNUM_INT_BITS - BIGNUM_INT_BITS/2; + + /* + * Newton-Raphson iteration to improve that starting reciprocal + * estimate: take f(x) = d - 1/x, and then the N-R formula gives + * x_new = x - f(x)/f'(x) = x - (d-1/x)/(1/x^2) = x(2-d*x). Or, + * taking our fixed-point representation into account, take f(x) + * to be d - K/x (where K = 2^(BIGNUM_INT_BITS*2-1) as discussed + * above) and then we get (2K - d*x) * x/K. + * + * Newton-Raphson doubles the number of correct bits at every + * iteration, and the initial division above already gave us half + * the output word, so it's only worth doing one iteration. + */ + BignumMULADD(prodh, prodl, recip, d, recip); + prodl = ~prodl; + prodh = ~prodh; + { + BignumCarry c; + BignumADC(prodl, c, prodl, 1, 0); + prodh += c; + } + BignumMUL(prodh, prodl, prodh, recip); + recip = (prodh << 1) | (prodl >> (BIGNUM_INT_BITS-1)); + + /* + * Now make sure we have the best possible reciprocal estimate, + * before we return it. We might have been off by a handful either + * way - not enough to bother with any better-thought-out kind of + * correction loop. + */ + BignumMULADD(prodh, prodl, recip, d, recip); + corrections = 0; + if (prodh >= BIGNUM_TOP_BIT) { + do { + BignumCarry c = 1; + BignumADC(prodl, c, prodl, ~d, c); prodh += BIGNUM_INT_MASK + c; + recip--; + corrections++; + } while (prodh >= ((BignumInt)1 << (BIGNUM_INT_BITS-1))); + } else { + while (1) { + BignumInt newprodh, newprodl; + BignumCarry c = 0; + BignumADC(newprodl, c, prodl, d, c); newprodh = prodh + c; + if (newprodh >= BIGNUM_TOP_BIT) + break; + prodh = newprodh; + prodl = newprodl; + recip++; + corrections++; + } + } + + return recip; +} + /* * Compute a = a % m. * Input in first alen words of a and first mlen words of m. * Output in first alen words of a * (of which first alen-mlen words will be zero). - * The MSW of m MUST have its high bit set. * Quotient is accumulated in the `quotient' array, which is a Bignum - * rather than the internal bigendian format. Quotient parts are shifted - * left by `qshift' before adding into quot. + * rather than the internal bigendian format. + * + * 'recip' must be the result of calling reciprocal_word() on the top + * BIGNUM_INT_BITS of the modulus (denoted m0 in comments below), with + * the topmost set bit normalised to the MSB of the input to + * reciprocal_word. 'rshift' is how far left the top nonzero word of + * the modulus had to be shifted to set that top bit. */ static void internal_mod(BignumInt *a, int alen, BignumInt *m, int mlen, - BignumInt *quot, int qshift) + BignumInt *quot, BignumInt recip, int rshift) { - BignumInt m0, m1, h; int i, k; - m0 = m[0]; - assert(m0 >> (BIGNUM_INT_BITS-1) == 1); - if (mlen > 1) - m1 = m[1]; - else - m1 = 0; +#ifdef DIVISION_DEBUG + { + int d; + printf("start division, m=0x"); + for (d = 0; d < mlen; d++) + printf("%0*llx", BIGNUM_INT_BITS/4, (unsigned long long)m[d]); + printf(", recip=%#0*llx, rshift=%d\n", + BIGNUM_INT_BITS/4, (unsigned long long)recip, rshift); + } +#endif - for (i = 0; i <= alen - mlen; i++) { - BignumDblInt t; - BignumInt q, r, c, ai1; - - if (i == 0) { - h = 0; - } else { - h = a[i - 1]; - a[i - 1] = 0; - } + /* + * Repeatedly use that reciprocal estimate to get a decent number + * of quotient bits, and subtract off the resulting multiple of m. + * + * Normally we expect to terminate this loop by means of finding + * out q=0 part way through, but one way in which we might not get + * that far in the first place is if the input a is actually zero, + * in which case we'll discard zero words from the front of a + * until we reach the termination condition in the for statement + * here. + */ + for (i = 0; i <= alen - mlen ;) { + BignumInt product; + BignumInt aword, q; + int shift, full_bitoffset, bitoffset, wordoffset; - if (i == alen - 1) - ai1 = 0; - else - ai1 = a[i + 1]; +#ifdef DIVISION_DEBUG + { + int d; + printf("main loop, a=0x"); + for (d = 0; d < alen; d++) + printf("%0*llx", BIGNUM_INT_BITS/4, (unsigned long long)a[d]); + printf("\n"); + } +#endif - /* Find q = h:a[i] / m0 */ - if (h >= m0) { - /* - * Special case. - * - * To illustrate it, suppose a BignumInt is 8 bits, and - * we are dividing (say) A1:23:45:67 by A1:B2:C3. Then - * our initial division will be 0xA123 / 0xA1, which - * will give a quotient of 0x100 and a divide overflow. - * However, the invariants in this division algorithm - * are not violated, since the full number A1:23:... is - * _less_ than the quotient prefix A1:B2:... and so the - * following correction loop would have sorted it out. - * - * In this situation we set q to be the largest - * quotient we _can_ stomach (0xFF, of course). - */ - q = BIGNUM_INT_MASK; - } else { - /* Macro doesn't want an array subscript expression passed - * into it (see definition), so use a temporary. */ - BignumInt tmplo = a[i]; - DIVMOD_WORD(q, r, h, tmplo, m0); - - /* Refine our estimate of q by looking at - h:a[i]:a[i+1] / m0:m1 */ - t = MUL_WORD(m1, q); - if (t > ((BignumDblInt) r << BIGNUM_INT_BITS) + ai1) { - q--; - t -= m1; - r = (r + m0) & BIGNUM_INT_MASK; /* overflow? */ - if (r >= (BignumDblInt) m0 && - t > ((BignumDblInt) r << BIGNUM_INT_BITS) + ai1) q--; - } - } + if (a[i] == 0) { +#ifdef DIVISION_DEBUG + printf("zero word at i=%d\n", i); +#endif + i++; + continue; + } - /* Subtract q * m from a[i...] */ - c = 0; - for (k = mlen - 1; k >= 0; k--) { - t = MUL_WORD(q, m[k]); - t += c; - c = (BignumInt)(t >> BIGNUM_INT_BITS); - if ((BignumInt) t > a[i + k]) - c++; - a[i + k] -= (BignumInt) t; - } + aword = a[i]; + shift = bn_clz(aword); + aword <<= shift; + if (shift > 0 && i+1 < alen) + aword |= a[i+1] >> (BIGNUM_INT_BITS - shift); - /* Add back m in case of borrow */ - if (c != h) { - t = 0; - for (k = mlen - 1; k >= 0; k--) { - t += m[k]; - t += a[i + k]; - a[i + k] = (BignumInt) t; - t = t >> BIGNUM_INT_BITS; - } - q--; - } - if (quot) - internal_add_shifted(quot, q, qshift + BIGNUM_INT_BITS * (alen - mlen - i)); + { + BignumInt unused; + BignumMUL(q, unused, recip, aword); + (void)unused; + } + +#ifdef DIVISION_DEBUG + printf("i=%d, aword=%#0*llx, shift=%d, q=%#0*llx\n", + i, BIGNUM_INT_BITS/4, (unsigned long long)aword, + shift, BIGNUM_INT_BITS/4, (unsigned long long)q); +#endif + + /* + * Work out the right bit and word offsets to use when + * subtracting q*m from a. + * + * aword was taken from a[i], which means its LSB was at bit + * position (alen-1-i) * BIGNUM_INT_BITS. But then we shifted + * it left by 'shift', so now the low bit of aword corresponds + * to bit position (alen-1-i) * BIGNUM_INT_BITS - shift, i.e. + * aword is approximately equal to a / 2^(that). + * + * m0 comes from the top word of mod, so its LSB is at bit + * position (mlen-1) * BIGNUM_INT_BITS - rshift, i.e. it can + * be considered to be m / 2^(that power). 'recip' is the + * reciprocal of m0, times 2^(BIGNUM_INT_BITS*2-1), i.e. it's + * about 2^((mlen+1) * BIGNUM_INT_BITS - rshift - 1) / m. + * + * Hence, recip * aword is approximately equal to the product + * of those, which simplifies to + * + * a/m * 2^((mlen+2+i-alen)*BIGNUM_INT_BITS + shift - rshift - 1) + * + * But we've also shifted recip*aword down by BIGNUM_INT_BITS + * to form q, so we have + * + * q ~= a/m * 2^((mlen+1+i-alen)*BIGNUM_INT_BITS + shift - rshift - 1) + * + * and hence, when we now compute q*m, it will be about + * a*2^(all that lot), i.e. the negation of that expression is + * how far left we have to shift the product q*m to make it + * approximately equal to a. + */ + full_bitoffset = -((mlen+1+i-alen)*BIGNUM_INT_BITS + shift-rshift-1); +#ifdef DIVISION_DEBUG + printf("full_bitoffset=%d\n", full_bitoffset); +#endif + + if (full_bitoffset < 0) { + /* + * If we find ourselves needing to shift q*m _right_, that + * means we've reached the bottom of the quotient. Clip q + * so that its right shift becomes zero, and if that means + * q becomes _actually_ zero, this loop is done. + */ + if (full_bitoffset <= -BIGNUM_INT_BITS) + break; + q >>= -full_bitoffset; + full_bitoffset = 0; + if (!q) + break; +#ifdef DIVISION_DEBUG + printf("now full_bitoffset=%d, q=%#0*llx\n", + full_bitoffset, BIGNUM_INT_BITS/4, (unsigned long long)q); +#endif + } + + wordoffset = full_bitoffset / BIGNUM_INT_BITS; + bitoffset = full_bitoffset % BIGNUM_INT_BITS; +#ifdef DIVISION_DEBUG + printf("wordoffset=%d, bitoffset=%d\n", wordoffset, bitoffset); +#endif + + /* wordoffset as computed above is the offset between the LSWs + * of m and a. But in fact m and a are stored MSW-first, so we + * need to adjust it to be the offset between the actual array + * indices, and flip the sign too. */ + wordoffset = alen - mlen - wordoffset; + + if (bitoffset == 0) { + BignumCarry c = 1; + BignumInt prev_hi_word = 0; + for (k = mlen - 1; wordoffset+k >= i; k--) { + BignumInt mword = k<0 ? 0 : m[k]; + BignumMULADD(prev_hi_word, product, q, mword, prev_hi_word); +#ifdef DIVISION_DEBUG + printf(" aligned sub: product word for m[%d] = %#0*llx\n", + k, BIGNUM_INT_BITS/4, + (unsigned long long)product); +#endif +#ifdef DIVISION_DEBUG + printf(" aligned sub: subtrahend for a[%d] = %#0*llx\n", + wordoffset+k, BIGNUM_INT_BITS/4, + (unsigned long long)product); +#endif + BignumADC(a[wordoffset+k], c, a[wordoffset+k], ~product, c); + } + } else { + BignumInt add_word = 0; + BignumInt c = 1; + BignumInt prev_hi_word = 0; + for (k = mlen - 1; wordoffset+k >= i; k--) { + BignumInt mword = k<0 ? 0 : m[k]; + BignumMULADD(prev_hi_word, product, q, mword, prev_hi_word); +#ifdef DIVISION_DEBUG + printf(" unaligned sub: product word for m[%d] = %#0*llx\n", + k, BIGNUM_INT_BITS/4, + (unsigned long long)product); +#endif + + add_word |= product << bitoffset; + +#ifdef DIVISION_DEBUG + printf(" unaligned sub: subtrahend for a[%d] = %#0*llx\n", + wordoffset+k, + BIGNUM_INT_BITS/4, (unsigned long long)add_word); +#endif + BignumADC(a[wordoffset+k], c, a[wordoffset+k], ~add_word, c); + + add_word = product >> (BIGNUM_INT_BITS - bitoffset); + } + } + + if (quot) { +#ifdef DIVISION_DEBUG + printf("adding quotient word %#0*llx << %d\n", + BIGNUM_INT_BITS/4, (unsigned long long)q, full_bitoffset); +#endif + internal_add_shifted(quot, q, full_bitoffset); +#ifdef DIVISION_DEBUG + { + int d; + printf("now quot=0x"); + for (d = quot[0]; d > 0; d--) + printf("%0*llx", BIGNUM_INT_BITS/4, + (unsigned long long)quot[d]); + printf("\n"); + } +#endif + } + } + +#ifdef DIVISION_DEBUG + { + int d; + printf("end main loop, a=0x"); + for (d = 0; d < alen; d++) + printf("%0*llx", BIGNUM_INT_BITS/4, (unsigned long long)a[d]); + if (quot) { + printf(", quot=0x"); + for (d = quot[0]; d > 0; d--) + printf("%0*llx", BIGNUM_INT_BITS/4, + (unsigned long long)quot[d]); + } + printf("\n"); + } +#endif + + /* + * The above loop should terminate with the remaining value in a + * being strictly less than 2*m (if a >= 2*m then we should always + * have managed to get a nonzero q word), but we can't guarantee + * that it will be strictly less than m: consider a case where the + * remainder is 1, and another where the remainder is m-1. By the + * time a contains a value that's _about m_, you clearly can't + * distinguish those cases by looking at only the top word of a - + * you have to go all the way down to the bottom before you find + * out whether it's just less or just more than m. + * + * Hence, we now do a final fixup in which we subtract one last + * copy of m, or don't, accordingly. We should never have to + * subtract more than one copy of m here. + */ + for (i = 0; i < alen; i++) { + /* Compare a with m, word by word, from the MSW down. As soon + * as we encounter a difference, we know whether we need the + * fixup. */ + int mindex = mlen-alen+i; + BignumInt mword = mindex < 0 ? 0 : m[mindex]; + if (a[i] < mword) { +#ifdef DIVISION_DEBUG + printf("final fixup not needed, a < m\n"); +#endif + return; + } else if (a[i] > mword) { +#ifdef DIVISION_DEBUG + printf("final fixup is needed, a > m\n"); +#endif + break; + } + /* If neither of those cases happened, the words are the same, + * so keep going and look at the next one. */ } +#ifdef DIVISION_DEBUG + if (i == mlen) /* if we printed neither of the above diagnostics */ + printf("final fixup is needed, a == m\n"); +#endif + + /* + * If we got here without returning, then a >= m, so we must + * subtract m, and increment the quotient. + */ + { + BignumCarry c = 1; + for (i = alen - 1; i >= 0; i--) { + int mindex = mlen-alen+i; + BignumInt mword = mindex < 0 ? 0 : m[mindex]; + BignumADC(a[i], c, a[i], ~mword, c); + } + } + if (quot) + internal_add_shifted(quot, 1, 0); + +#ifdef DIVISION_DEBUG + { + int d; + printf("after final fixup, a=0x"); + for (d = 0; d < alen; d++) + printf("%0*llx", BIGNUM_INT_BITS/4, (unsigned long long)a[d]); + if (quot) { + printf(", quot=0x"); + for (d = quot[0]; d > 0; d--) + printf("%0*llx", BIGNUM_INT_BITS/4, + (unsigned long long)quot[d]); + } + printf("\n"); + } +#endif } /* @@ -641,7 +941,8 @@ Bignum modpow_simple(Bignum base_in, Bignum exp, Bignum mod) { BignumInt *a, *b, *n, *m, *scratch; - int mshift; + BignumInt recip; + int rshift; int mlen, scratchlen, i, j; Bignum base, result; @@ -664,16 +965,6 @@ for (j = 0; j < mlen; j++) m[j] = mod[mod[0] - j]; - /* Shift m left to make msb bit set */ - for (mshift = 0; mshift < BIGNUM_INT_BITS-1; mshift++) - if ((m[0] << mshift) & BIGNUM_TOP_BIT) - break; - if (mshift) { - for (i = 0; i < mlen - 1; i++) - m[i] = (m[i] << mshift) | (m[i + 1] >> (BIGNUM_INT_BITS - mshift)); - m[mlen - 1] = m[mlen - 1] << mshift; - } - /* Allocate n of size mlen, copy base to n */ n = snewn(mlen, BignumInt); i = mlen - base[0]; @@ -704,14 +995,26 @@ } } + /* Compute reciprocal of the top full word of the modulus */ + { + BignumInt m0 = m[0]; + rshift = bn_clz(m0); + if (rshift) { + m0 <<= rshift; + if (mlen > 1) + m0 |= m[1] >> (BIGNUM_INT_BITS - rshift); + } + recip = reciprocal_word(m0); + } + /* Main computation */ while (i < (int)exp[0]) { while (j >= 0) { internal_mul(a + mlen, a + mlen, b, mlen, scratch); - internal_mod(b, mlen * 2, m, mlen, NULL, 0); + internal_mod(b, mlen * 2, m, mlen, NULL, recip, rshift); if ((exp[exp[0] - i] & ((BignumInt)1 << j)) != 0) { internal_mul(b + mlen, n, a, mlen, scratch); - internal_mod(a, mlen * 2, m, mlen, NULL, 0); + internal_mod(a, mlen * 2, m, mlen, NULL, recip, rshift); } else { BignumInt *t; t = a; @@ -724,16 +1027,6 @@ j = BIGNUM_INT_BITS-1; } - /* Fixup result in case the modulus was shifted */ - if (mshift) { - for (i = mlen - 1; i < 2 * mlen - 1; i++) - a[i] = (a[i] << mshift) | (a[i + 1] >> (BIGNUM_INT_BITS - mshift)); - a[2 * mlen - 1] = a[2 * mlen - 1] << mshift; - internal_mod(a, mlen * 2, m, mlen, NULL, 0); - for (i = 2 * mlen - 1; i >= mlen; i--) - a[i] = (a[i] >> mshift) | (a[i - 1] << (BIGNUM_INT_BITS - mshift)); - } - /* Copy result to buffer */ result = newbn(mod[0]); for (i = 0; i < mlen; i++) @@ -912,7 +1205,8 @@ Bignum modmul(Bignum p, Bignum q, Bignum mod) { BignumInt *a, *n, *m, *o, *scratch; - int mshift, scratchlen; + BignumInt recip; + int rshift, scratchlen; int pqlen, mlen, rlen, i, j; Bignum result; @@ -929,16 +1223,6 @@ for (j = 0; j < mlen; j++) m[j] = mod[mod[0] - j]; - /* Shift m left to make msb bit set */ - for (mshift = 0; mshift < BIGNUM_INT_BITS-1; mshift++) - if ((m[0] << mshift) & BIGNUM_TOP_BIT) - break; - if (mshift) { - for (i = 0; i < mlen - 1; i++) - m[i] = (m[i] << mshift) | (m[i + 1] >> (BIGNUM_INT_BITS - mshift)); - m[mlen - 1] = m[mlen - 1] << mshift; - } - pqlen = (p[0] > q[0] ? p[0] : q[0]); /* @@ -971,19 +1255,21 @@ scratchlen = mul_compute_scratch(pqlen); scratch = snewn(scratchlen, BignumInt); + /* Compute reciprocal of the top full word of the modulus */ + { + BignumInt m0 = m[0]; + rshift = bn_clz(m0); + if (rshift) { + m0 <<= rshift; + if (mlen > 1) + m0 |= m[1] >> (BIGNUM_INT_BITS - rshift); + } + recip = reciprocal_word(m0); + } + /* Main computation */ internal_mul(n, o, a, pqlen, scratch); - internal_mod(a, pqlen * 2, m, mlen, NULL, 0); - - /* Fixup result in case the modulus was shifted */ - if (mshift) { - for (i = 2 * pqlen - mlen - 1; i < 2 * pqlen - 1; i++) - a[i] = (a[i] << mshift) | (a[i + 1] >> (BIGNUM_INT_BITS - mshift)); - a[2 * pqlen - 1] = a[2 * pqlen - 1] << mshift; - internal_mod(a, pqlen * 2, m, mlen, NULL, 0); - for (i = 2 * pqlen - 1; i >= 2 * pqlen - mlen; i--) - a[i] = (a[i] >> mshift) | (a[i - 1] << (BIGNUM_INT_BITS - mshift)); - } + internal_mod(a, pqlen * 2, m, mlen, NULL, recip, rshift); /* Copy result to buffer */ rlen = (mlen < pqlen * 2 ? mlen : pqlen * 2); @@ -1047,7 +1333,8 @@ static void bigdivmod(Bignum p, Bignum mod, Bignum result, Bignum quotient) { BignumInt *n, *m; - int mshift; + BignumInt recip; + int rshift; int plen, mlen, i, j; /* @@ -1063,16 +1350,6 @@ for (j = 0; j < mlen; j++) m[j] = mod[mod[0] - j]; - /* Shift m left to make msb bit set */ - for (mshift = 0; mshift < BIGNUM_INT_BITS-1; mshift++) - if ((m[0] << mshift) & BIGNUM_TOP_BIT) - break; - if (mshift) { - for (i = 0; i < mlen - 1; i++) - m[i] = (m[i] << mshift) | (m[i + 1] >> (BIGNUM_INT_BITS - mshift)); - m[mlen - 1] = m[mlen - 1] << mshift; - } - plen = p[0]; /* Ensure plen > mlen */ if (plen <= mlen) @@ -1085,19 +1362,21 @@ for (j = 1; j <= (int)p[0]; j++) n[plen - j] = p[j]; - /* Main computation */ - internal_mod(n, plen, m, mlen, quotient, mshift); - - /* Fixup result in case the modulus was shifted */ - if (mshift) { - for (i = plen - mlen - 1; i < plen - 1; i++) - n[i] = (n[i] << mshift) | (n[i + 1] >> (BIGNUM_INT_BITS - mshift)); - n[plen - 1] = n[plen - 1] << mshift; - internal_mod(n, plen, m, mlen, quotient, 0); - for (i = plen - 1; i >= plen - mlen; i--) - n[i] = (n[i] >> mshift) | (n[i - 1] << (BIGNUM_INT_BITS - mshift)); + /* Compute reciprocal of the top full word of the modulus */ + { + BignumInt m0 = m[0]; + rshift = bn_clz(m0); + if (rshift) { + m0 <<= rshift; + if (mlen > 1) + m0 |= m[1] >> (BIGNUM_INT_BITS - rshift); + } + recip = reciprocal_word(m0); } + /* Main computation */ + internal_mod(n, plen, m, mlen, quotient, recip, rshift); + /* Copy result to buffer */ if (result) { for (i = 1; i <= (int)result[0]; i++) { @@ -1142,8 +1421,7 @@ (BignumInt)byte << (8*i % BIGNUM_INT_BITS); } - while (result[0] > 1 && result[result[0]] == 0) - result[0]--; + bn_restore_invariant(result); return result; } @@ -1165,8 +1443,7 @@ (BignumInt)byte << (8*i % BIGNUM_INT_BITS); } - while (result[0] > 1 && result[result[0]] == 0) - result[0]--; + bn_restore_invariant(result); return result; } @@ -1311,9 +1588,9 @@ */ void bignum_set_bit(Bignum bn, int bitnum, int value) { - if (bitnum < 0 || bitnum >= (int)(BIGNUM_INT_BITS * bn[0])) - abort(); /* beyond the end */ - else { + if (bitnum < 0 || bitnum >= (int)(BIGNUM_INT_BITS * bn[0])) { + if (value) abort(); /* beyond the end */ + } else { int v = bitnum / BIGNUM_INT_BITS + 1; BignumInt mask = (BignumInt)1 << (bitnum % BIGNUM_INT_BITS); if (value) @@ -1478,12 +1755,11 @@ /* now add in the addend, if any */ if (addend) { - BignumDblInt carry = 0; + BignumCarry carry = 0; for (i = 1; i <= rlen; i++) { - carry += (i <= (int)ret[0] ? ret[i] : 0); - carry += (i <= (int)addend[0] ? addend[i] : 0); - ret[i] = (BignumInt) carry & BIGNUM_INT_MASK; - carry >>= BIGNUM_INT_BITS; + BignumInt retword = (i <= (int)ret[0] ? ret[i] : 0); + BignumInt addword = (i <= (int)addend[0] ? addend[i] : 0); + BignumADC(ret[i], carry, retword, addword, carry); if (ret[i] != 0 && i > maxspot) maxspot = i; } @@ -1512,17 +1788,16 @@ int rlen = (alen > blen ? alen : blen) + 1; int i, maxspot; Bignum ret; - BignumDblInt carry; + BignumCarry carry; ret = newbn(rlen); carry = 0; maxspot = 0; for (i = 1; i <= rlen; i++) { - carry += (i <= (int)a[0] ? a[i] : 0); - carry += (i <= (int)b[0] ? b[i] : 0); - ret[i] = (BignumInt) carry & BIGNUM_INT_MASK; - carry >>= BIGNUM_INT_BITS; + BignumInt aword = (i <= (int)a[0] ? a[i] : 0); + BignumInt bword = (i <= (int)b[0] ? b[i] : 0); + BignumADC(ret[i], carry, aword, bword, carry); if (ret[i] != 0 && i > maxspot) maxspot = i; } @@ -1542,17 +1817,16 @@ int rlen = (alen > blen ? alen : blen); int i, maxspot; Bignum ret; - BignumDblInt carry; + BignumCarry carry; ret = newbn(rlen); carry = 1; maxspot = 0; for (i = 1; i <= rlen; i++) { - carry += (i <= (int)a[0] ? a[i] : 0); - carry += (i <= (int)b[0] ? b[i] ^ BIGNUM_INT_MASK : BIGNUM_INT_MASK); - ret[i] = (BignumInt) carry & BIGNUM_INT_MASK; - carry >>= BIGNUM_INT_BITS; + BignumInt aword = (i <= (int)a[0] ? a[i] : 0); + BignumInt bword = (i <= (int)b[0] ? b[i] : 0); + BignumADC(ret[i], carry, aword, ~bword, carry); if (ret[i] != 0 && i > maxspot) maxspot = i; } @@ -1592,40 +1866,52 @@ } /* - * Convert a (max 32-bit) long into a bignum. + * Convert an unsigned long into a bignum. */ -Bignum bignum_from_long(unsigned long nn) +Bignum bignum_from_long(unsigned long n) { + const int maxwords = + (sizeof(unsigned long) + sizeof(BignumInt) - 1) / sizeof(BignumInt); Bignum ret; - BignumDblInt n = nn; + int i; + + ret = newbn(maxwords); + ret[0] = 0; + for (i = 0; i < maxwords; i++) { + ret[i+1] = n >> (i * BIGNUM_INT_BITS); + if (ret[i+1] != 0) + ret[0] = i+1; + } - ret = newbn(3); - ret[1] = (BignumInt)(n & BIGNUM_INT_MASK); - ret[2] = (BignumInt)((n >> BIGNUM_INT_BITS) & BIGNUM_INT_MASK); - ret[3] = 0; - ret[0] = (ret[2] ? 2 : 1); return ret; } /* * Add a long to a bignum. */ -Bignum bignum_add_long(Bignum number, unsigned long addendx) +Bignum bignum_add_long(Bignum number, unsigned long n) { - Bignum ret = newbn(number[0] + 1); - int i, maxspot = 0; - BignumDblInt carry = 0, addend = addendx; + const int maxwords = + (sizeof(unsigned long) + sizeof(BignumInt) - 1) / sizeof(BignumInt); + Bignum ret; + int words, i; + BignumCarry carry; - for (i = 1; i <= (int)ret[0]; i++) { - carry += addend & BIGNUM_INT_MASK; - carry += (i <= (int)number[0] ? number[i] : 0); - addend >>= BIGNUM_INT_BITS; - ret[i] = (BignumInt) carry & BIGNUM_INT_MASK; - carry >>= BIGNUM_INT_BITS; - if (ret[i] != 0) - maxspot = i; + words = number[0]; + if (words < maxwords) + words = maxwords; + words++; + ret = newbn(words); + + carry = 0; + ret[0] = 0; + for (i = 0; i < words; i++) { + BignumInt nword = (i < maxwords ? n >> (i * BIGNUM_INT_BITS) : 0); + BignumInt numword = (i < number[0] ? number[i+1] : 0); + BignumADC(ret[i+1], carry, numword, nword, carry); + if (ret[i+1] != 0) + ret[0] = i+1; } - ret[0] = maxspot; return ret; } @@ -1634,13 +1920,17 @@ */ unsigned short bignum_mod_short(Bignum number, unsigned short modulus) { - BignumDblInt mod, r; + unsigned long mod = modulus, r = 0; + /* Precompute (BIGNUM_INT_MASK+1) % mod */ + unsigned long base_r = (BIGNUM_INT_MASK - modulus + 1) % mod; int i; - r = 0; - mod = modulus; - for (i = number[0]; i > 0; i--) - r = (r * (BIGNUM_TOP_BIT % mod) * 2 + number[i] % mod) % mod; + for (i = number[0]; i > 0; i--) { + /* + * Conceptually, ((r << BIGNUM_INT_BITS) + number[i]) % mod + */ + r = ((r * base_r) + (number[i] % mod)) % mod; + } return (unsigned short) r; } @@ -1798,7 +2088,7 @@ { int ndigits, ndigit; int i, iszero; - BignumDblInt carry; + BignumInt carry; char *ret; BignumInt *workspace; @@ -1845,11 +2135,33 @@ iszero = 1; carry = 0; for (i = 0; i < (int)x[0]; i++) { - carry = (carry << BIGNUM_INT_BITS) + workspace[i]; - workspace[i] = (BignumInt) (carry / 10); + /* + * Conceptually, we want to compute + * + * (carry << BIGNUM_INT_BITS) + workspace[i] + * ----------------------------------------- + * 10 + * + * but we don't have an integer type longer than BignumInt + * to work with. So we have to do it in pieces. + */ + + BignumInt q, r; + q = workspace[i] / 10; + r = workspace[i] % 10; + + /* I want (BIGNUM_INT_MASK+1)/10 but can't say so directly! */ + q += carry * ((BIGNUM_INT_MASK-9) / 10 + 1); + r += carry * ((BIGNUM_INT_MASK-9) % 10); + + q += r / 10; + r %= 10; + + workspace[i] = q; + carry = r; + if (workspace[i]) iszero = 0; - carry %= 10; } ret[--ndigit] = (char) (carry + '0'); } while (!iszero); @@ -1868,210 +2180,3 @@ sfree(workspace); return ret; } - -#ifdef TESTBN - -#include -#include -#include - -/* - * gcc -Wall -g -O0 -DTESTBN -o testbn sshbn.c misc.c conf.c tree234.c unix/uxmisc.c -I. -I unix -I charset - * - * Then feed to this program's standard input the output of - * testdata/bignum.py . - */ - -void modalfatalbox(const char *p, ...) -{ - va_list ap; - fprintf(stderr, "FATAL ERROR: "); - va_start(ap, p); - vfprintf(stderr, p, ap); - va_end(ap); - fputc('\n', stderr); - exit(1); -} - -int random_byte(void) -{ - modalfatalbox("random_byte called in testbn"); - return 0; -} - -#define fromxdigit(c) ( (c)>'9' ? ((c)&0xDF) - 'A' + 10 : (c) - '0' ) - -int main(int argc, char **argv) -{ - char *buf; - int line = 0; - int passes = 0, fails = 0; - - while ((buf = fgetline(stdin)) != NULL) { - int maxlen = strlen(buf); - unsigned char *data = snewn(maxlen, unsigned char); - unsigned char *ptrs[5], *q; - int ptrnum; - char *bufp = buf; - - line++; - - q = data; - ptrnum = 0; - - while (*bufp && !isspace((unsigned char)*bufp)) - bufp++; - if (bufp) - *bufp++ = '\0'; - - while (*bufp) { - char *start, *end; - int i; - - while (*bufp && !isxdigit((unsigned char)*bufp)) - bufp++; - start = bufp; - - if (!*bufp) - break; - - while (*bufp && isxdigit((unsigned char)*bufp)) - bufp++; - end = bufp; - - if (ptrnum >= lenof(ptrs)) - break; - ptrs[ptrnum++] = q; - - for (i = -((end - start) & 1); i < end-start; i += 2) { - unsigned char val = (i < 0 ? 0 : fromxdigit(start[i])); - val = val * 16 + fromxdigit(start[i+1]); - *q++ = val; - } - - ptrs[ptrnum] = q; - } - - if (!strcmp(buf, "mul")) { - Bignum a, b, c, p; - - if (ptrnum != 3) { - printf("%d: mul with %d parameters, expected 3\n", line, ptrnum); - exit(1); - } - a = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]); - b = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]); - c = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]); - p = bigmul(a, b); - - if (bignum_cmp(c, p) == 0) { - passes++; - } else { - char *as = bignum_decimal(a); - char *bs = bignum_decimal(b); - char *cs = bignum_decimal(c); - char *ps = bignum_decimal(p); - - printf("%d: fail: %s * %s gave %s expected %s\n", - line, as, bs, ps, cs); - fails++; - - sfree(as); - sfree(bs); - sfree(cs); - sfree(ps); - } - freebn(a); - freebn(b); - freebn(c); - freebn(p); - } else if (!strcmp(buf, "modmul")) { - Bignum a, b, m, c, p; - - if (ptrnum != 4) { - printf("%d: modmul with %d parameters, expected 4\n", - line, ptrnum); - exit(1); - } - a = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]); - b = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]); - m = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]); - c = bignum_from_bytes(ptrs[3], ptrs[4]-ptrs[3]); - p = modmul(a, b, m); - - if (bignum_cmp(c, p) == 0) { - passes++; - } else { - char *as = bignum_decimal(a); - char *bs = bignum_decimal(b); - char *ms = bignum_decimal(m); - char *cs = bignum_decimal(c); - char *ps = bignum_decimal(p); - - printf("%d: fail: %s * %s mod %s gave %s expected %s\n", - line, as, bs, ms, ps, cs); - fails++; - - sfree(as); - sfree(bs); - sfree(ms); - sfree(cs); - sfree(ps); - } - freebn(a); - freebn(b); - freebn(m); - freebn(c); - freebn(p); - } else if (!strcmp(buf, "pow")) { - Bignum base, expt, modulus, expected, answer; - - if (ptrnum != 4) { - printf("%d: mul with %d parameters, expected 4\n", line, ptrnum); - exit(1); - } - - base = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]); - expt = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]); - modulus = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]); - expected = bignum_from_bytes(ptrs[3], ptrs[4]-ptrs[3]); - answer = modpow(base, expt, modulus); - - if (bignum_cmp(expected, answer) == 0) { - passes++; - } else { - char *as = bignum_decimal(base); - char *bs = bignum_decimal(expt); - char *cs = bignum_decimal(modulus); - char *ds = bignum_decimal(answer); - char *ps = bignum_decimal(expected); - - printf("%d: fail: %s ^ %s mod %s gave %s expected %s\n", - line, as, bs, cs, ds, ps); - fails++; - - sfree(as); - sfree(bs); - sfree(cs); - sfree(ds); - sfree(ps); - } - freebn(base); - freebn(expt); - freebn(modulus); - freebn(expected); - freebn(answer); - } else { - printf("%d: unrecognised test keyword: '%s'\n", line, buf); - exit(1); - } - - sfree(buf); - sfree(data); - } - - printf("passed %d failed %d total %d\n", passes, fails, passes+fails); - return fails != 0; -} - -#endif diff -Nru filezilla-3.14.1/src/putty/sshbn.h filezilla-3.15.0.2/src/putty/sshbn.h --- filezilla-3.14.1/src/putty/sshbn.h 2015-08-22 09:28:47.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshbn.h 2016-02-05 08:54:46.000000000 +0000 @@ -1,109 +1,220 @@ /* * sshbn.h: the assorted conditional definitions of BignumInt and - * multiply/divide macros used throughout the bignum code to treat - * numbers as arrays of the most conveniently sized word for the - * target machine. Exported so that other code (e.g. poly1305) can use - * it too. - */ - -/* - * Usage notes: - * * Do not call the DIVMOD_WORD macro with expressions such as array - * subscripts, as some implementations object to this (see below). - * * Note that none of the division methods below will cope if the - * quotient won't fit into BIGNUM_INT_BITS. Callers should be careful - * to avoid this case. - * If this condition occurs, in the case of the x86 DIV instruction, - * an overflow exception will occur, which (according to a correspondent) - * will manifest on Windows as something like - * 0xC0000095: Integer overflow - * The C variant won't give the right answer, either. + * multiply macros used throughout the bignum code to treat numbers as + * arrays of the most conveniently sized word for the target machine. + * Exported so that other code (e.g. poly1305) can use it too. + * + * This file must export, in whatever ifdef branch it ends up in: + * + * - two types: 'BignumInt' and 'BignumCarry'. BignumInt is an + * unsigned integer type which will be used as the base word size + * for all bignum operations. BignumCarry is an unsigned integer + * type used to hold the carry flag taken as input and output by + * the BignumADC macro (see below). + * + * - four constant macros: BIGNUM_INT_BITS, BIGNUM_INT_BYTES, + * BIGNUM_TOP_BIT, BIGNUM_INT_MASK. These should be more or less + * self-explanatory, but just in case, they give the number of bits + * in BignumInt, the number of bytes that works out to, the + * BignumInt value consisting of only the top bit, and the + * BignumInt value with all bits set. + * + * - four statement macros: BignumADC, BignumMUL, BignumMULADD, + * BignumMULADD2. These do various kinds of multi-word arithmetic, + * and all produce two output values. + * * BignumADC(ret,retc,a,b,c) takes input BignumInt values a,b + * and a BignumCarry c, and outputs a BignumInt ret = a+b+c and + * a BignumCarry retc which is the carry off the top of that + * addition. + * * BignumMUL(rh,rl,a,b) returns the two halves of the + * double-width product a*b. + * * BignumMULADD(rh,rl,a,b,addend) returns the two halves of the + * double-width value a*b + addend. + * * BignumMULADD2(rh,rl,a,b,addend1,addend2) returns the two + * halves of the double-width value a*b + addend1 + addend2. + * + * Every branch of the main ifdef below defines the type BignumInt and + * the value BIGNUM_INT_BITS. The other three constant macros are + * filled in by common code further down. + * + * Most branches also define a macro DEFINE_BIGNUMDBLINT containing a + * typedef statement which declares a type _twice_ the length of a + * BignumInt. This causes the common code further down to produce a + * default implementation of the four statement macros in terms of + * that double-width type, and also to defined BignumCarry to be + * BignumInt. + * + * However, if a particular compile target does not have a type twice + * the length of the BignumInt you want to use but it does provide + * some alternative means of doing add-with-carry and double-word + * multiply, then the ifdef branch in question can just define + * BignumCarry and the four statement macros itself, and that's fine + * too. */ #if defined __SIZEOF_INT128__ -/* gcc and clang both provide a __uint128_t type on 64-bit targets - * (and, when they do, indicate its presence by the above macro), - * using the same 'two machine registers' kind of code generation that - * 32-bit targets use for 64-bit ints. If we have one of these, we can - * use a 64-bit BignumInt and a 128-bit BignumDblInt. */ -typedef unsigned long long BignumInt; -typedef __uint128_t BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL -#define BIGNUM_TOP_BIT 0x8000000000000000ULL -#define BIGNUM_INT_BITS 64 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -#define DIVMOD_WORD(q, r, hi, lo, w) do { \ - BignumDblInt n = (((BignumDblInt)hi) << BIGNUM_INT_BITS) | lo; \ - q = n / w; \ - r = n % w; \ -} while (0) -#elif defined __GNUC__ && defined __i386__ -typedef unsigned long BignumInt; -typedef unsigned long long BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFFFFFUL -#define BIGNUM_TOP_BIT 0x80000000UL -#define BIGNUM_INT_BITS 32 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -#define DIVMOD_WORD(q, r, hi, lo, w) \ - __asm__("div %2" : \ - "=d" (r), "=a" (q) : \ - "r" (w), "d" (hi), "a" (lo)) + + /* + * 64-bit BignumInt using gcc/clang style 128-bit BignumDblInt. + * + * gcc and clang both provide a __uint128_t type on 64-bit targets + * (and, when they do, indicate its presence by the above macro), + * using the same 'two machine registers' kind of code generation + * that 32-bit targets use for 64-bit ints. + */ + + typedef unsigned long long BignumInt; + #define BIGNUM_INT_BITS 64 + #define DEFINE_BIGNUMDBLINT typedef __uint128_t BignumDblInt + +#elif defined _MSC_VER && defined _M_AMD64 + + /* + * 64-bit BignumInt, using Visual Studio x86-64 compiler intrinsics. + * + * 64-bit Visual Studio doesn't provide very much in the way of help + * here: there's no int128 type, and also no inline assembler giving + * us direct access to the x86-64 MUL or ADC instructions. However, + * there are compiler intrinsics giving us that access, so we can + * use those - though it turns out we have to be a little careful, + * since they seem to generate wrong code if their pointer-typed + * output parameters alias their inputs. Hence all the internal temp + * variables inside the macros. + */ + + #include + typedef unsigned char BignumCarry; /* the type _addcarry_u64 likes to use */ + typedef unsigned __int64 BignumInt; + #define BIGNUM_INT_BITS 64 + #define BignumADC(ret, retc, a, b, c) do \ + { \ + BignumInt ADC_tmp; \ + (retc) = _addcarry_u64(c, a, b, &ADC_tmp); \ + (ret) = ADC_tmp; \ + } while (0) + #define BignumMUL(rh, rl, a, b) do \ + { \ + BignumInt MULADD_hi; \ + (rl) = _umul128(a, b, &MULADD_hi); \ + (rh) = MULADD_hi; \ + } while (0) + #define BignumMULADD(rh, rl, a, b, addend) do \ + { \ + BignumInt MULADD_lo, MULADD_hi; \ + MULADD_lo = _umul128(a, b, &MULADD_hi); \ + MULADD_hi += _addcarry_u64(0, MULADD_lo, (addend), &(rl)); \ + (rh) = MULADD_hi; \ + } while (0) + #define BignumMULADD2(rh, rl, a, b, addend1, addend2) do \ + { \ + BignumInt MULADD_lo1, MULADD_lo2, MULADD_hi; \ + MULADD_lo1 = _umul128(a, b, &MULADD_hi); \ + MULADD_hi += _addcarry_u64(0, MULADD_lo1, (addend1), &MULADD_lo2); \ + MULADD_hi += _addcarry_u64(0, MULADD_lo2, (addend2), &(rl)); \ + (rh) = MULADD_hi; \ + } while (0) + +#elif defined __GNUC__ || defined _LLP64 || __STDC__ >= 199901L + + /* 32-bit BignumInt, using C99 unsigned long long as BignumDblInt */ + + typedef unsigned int BignumInt; + #define BIGNUM_INT_BITS 32 + #define DEFINE_BIGNUMDBLINT typedef unsigned long long BignumDblInt + #elif defined _MSC_VER && defined _M_IX86 -typedef unsigned __int32 BignumInt; -typedef unsigned __int64 BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFFFFFUL -#define BIGNUM_TOP_BIT 0x80000000UL -#define BIGNUM_INT_BITS 32 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -/* Note: MASM interprets array subscripts in the macro arguments as - * assembler syntax, which gives the wrong answer. Don't supply them. - * */ -#define DIVMOD_WORD(q, r, hi, lo, w) do { \ - __asm mov edx, hi \ - __asm mov eax, lo \ - __asm div w \ - __asm mov r, edx \ - __asm mov q, eax \ -} while(0) + + /* 32-bit BignumInt, using Visual Studio __int64 as BignumDblInt */ + + typedef unsigned int BignumInt; + #define BIGNUM_INT_BITS 32 + #define DEFINE_BIGNUMDBLINT typedef unsigned __int64 BignumDblInt + #elif defined _LP64 -/* 64-bit architectures can do 32x32->64 chunks at a time */ -typedef unsigned int BignumInt; -typedef unsigned long BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFFFFFU -#define BIGNUM_TOP_BIT 0x80000000U -#define BIGNUM_INT_BITS 32 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -#define DIVMOD_WORD(q, r, hi, lo, w) do { \ - BignumDblInt n = (((BignumDblInt)hi) << BIGNUM_INT_BITS) | lo; \ - q = n / w; \ - r = n % w; \ -} while (0) -#elif defined _LLP64 -/* 64-bit architectures in which unsigned long is 32 bits, not 64 */ -typedef unsigned long BignumInt; -typedef unsigned long long BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFFFFFUL -#define BIGNUM_TOP_BIT 0x80000000UL -#define BIGNUM_INT_BITS 32 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -#define DIVMOD_WORD(q, r, hi, lo, w) do { \ - BignumDblInt n = (((BignumDblInt)hi) << BIGNUM_INT_BITS) | lo; \ - q = n / w; \ - r = n % w; \ -} while (0) + + /* + * 32-bit BignumInt, using unsigned long itself as BignumDblInt. + * + * Only for platforms where long is 64 bits, of course. + */ + + typedef unsigned int BignumInt; + #define BIGNUM_INT_BITS 32 + #define DEFINE_BIGNUMDBLINT typedef unsigned long BignumDblInt + #else -/* Fallback for all other cases */ -typedef unsigned short BignumInt; -typedef unsigned long BignumDblInt; -#define BIGNUM_INT_MASK 0xFFFFU -#define BIGNUM_TOP_BIT 0x8000U -#define BIGNUM_INT_BITS 16 -#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2) -#define DIVMOD_WORD(q, r, hi, lo, w) do { \ - BignumDblInt n = (((BignumDblInt)hi) << BIGNUM_INT_BITS) | lo; \ - q = n / w; \ - r = n % w; \ -} while (0) + + /* + * 16-bit BignumInt, using unsigned long as BignumDblInt. + * + * This is the final fallback for real emergencies: C89 guarantees + * unsigned short/long to be at least the required sizes, so this + * should work on any C implementation at all. But it'll be + * noticeably slow, so if you find yourself in this case you + * probably want to move heaven and earth to find an alternative! + */ + + typedef unsigned short BignumInt; + #define BIGNUM_INT_BITS 16 + #define DEFINE_BIGNUMDBLINT typedef unsigned long BignumDblInt + #endif +/* + * Common code across all branches of that ifdef: define the three + * easy constant macros in terms of BIGNUM_INT_BITS. + */ #define BIGNUM_INT_BYTES (BIGNUM_INT_BITS / 8) +#define BIGNUM_TOP_BIT (((BignumInt)1) << (BIGNUM_INT_BITS-1)) +#define BIGNUM_INT_MASK (BIGNUM_TOP_BIT | (BIGNUM_TOP_BIT-1)) + +/* + * Common code across _most_ branches of the ifdef: define a set of + * statement macros in terms of the BignumDblInt type provided. In + * this case, we also define BignumCarry to be the same thing as + * BignumInt, for simplicity. + */ +#ifdef DEFINE_BIGNUMDBLINT + + typedef BignumInt BignumCarry; + #define BignumADC(ret, retc, a, b, c) do \ + { \ + DEFINE_BIGNUMDBLINT; \ + BignumDblInt ADC_temp = (BignumInt)(a); \ + ADC_temp += (BignumInt)(b); \ + ADC_temp += (c); \ + (ret) = (BignumInt)ADC_temp; \ + (retc) = (BignumCarry)(ADC_temp >> BIGNUM_INT_BITS); \ + } while (0) + + #define BignumMUL(rh, rl, a, b) do \ + { \ + DEFINE_BIGNUMDBLINT; \ + BignumDblInt MUL_temp = (BignumInt)(a); \ + MUL_temp *= (BignumInt)(b); \ + (rh) = (BignumInt)(MUL_temp >> BIGNUM_INT_BITS); \ + (rl) = (BignumInt)(MUL_temp); \ + } while (0) + + #define BignumMULADD(rh, rl, a, b, addend) do \ + { \ + DEFINE_BIGNUMDBLINT; \ + BignumDblInt MUL_temp = (BignumInt)(a); \ + MUL_temp *= (BignumInt)(b); \ + MUL_temp += (BignumInt)(addend); \ + (rh) = (BignumInt)(MUL_temp >> BIGNUM_INT_BITS); \ + (rl) = (BignumInt)(MUL_temp); \ + } while (0) + + #define BignumMULADD2(rh, rl, a, b, addend1, addend2) do \ + { \ + DEFINE_BIGNUMDBLINT; \ + BignumDblInt MUL_temp = (BignumInt)(a); \ + MUL_temp *= (BignumInt)(b); \ + MUL_temp += (BignumInt)(addend1); \ + MUL_temp += (BignumInt)(addend2); \ + (rh) = (BignumInt)(MUL_temp >> BIGNUM_INT_BITS); \ + (rl) = (BignumInt)(MUL_temp); \ + } while (0) + +#endif /* DEFINE_BIGNUMDBLINT */ diff -Nru filezilla-3.14.1/src/putty/ssh.c filezilla-3.15.0.2/src/putty/ssh.c --- filezilla-3.14.1/src/putty/ssh.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/ssh.c 2016-02-05 08:54:46.000000000 +0000 @@ -366,6 +366,7 @@ struct Packet *pktin); static void ssh2_channel_check_close(struct ssh_channel *c); static void ssh_channel_destroy(struct ssh_channel *c); +static void ssh2_msg_something_unimplemented(Ssh ssh, struct Packet *pktin); /* * Buffer management constants. There are several of these for @@ -793,6 +794,7 @@ int send_ok; int echoing, editing; + int session_started; void *frontend; int ospeed, ispeed; /* temporaries */ @@ -2016,6 +2018,15 @@ } /* + * RFC 4253 doesn't explicitly say that completely empty packets + * with no type byte are forbidden, so treat them as deserving + * an SSH_MSG_UNIMPLEMENTED. + */ + if (st->pktin->length <= 5) { /* == 5 we hope, but robustness */ + ssh2_msg_something_unimplemented(ssh, st->pktin); + crStop(NULL); + } + /* * pktin->body and pktin->length should identify the semantic * content of the packet, excluding the initial type byte. */ @@ -3188,6 +3199,10 @@ } ssh_fix_verstring(verstring + strlen(protoname)); +#ifdef FUZZING + /* FUZZING make PuTTY insecure, so make live use difficult. */ + verstring[0] = 'I'; +#endif if (ssh->version == 2) { size_t len; @@ -3237,6 +3252,8 @@ crReturn(1); } + ssh->session_started = TRUE; + s->vstrsize = sizeof(protoname) + 16; s->vstring = snewn(s->vstrsize, char); strcpy(s->vstring, protoname); @@ -3619,34 +3636,20 @@ const char *error_msg, int error_code) { Ssh ssh = (Ssh) plug; - char addrbuf[256], *msg; - if (ssh->attempting_connshare) { - /* - * While we're attempting connection sharing, don't loudly log - * everything that happens. Real TCP connections need to be - * logged when we _start_ trying to connect, because it might - * be ages before they respond if something goes wrong; but - * connection sharing is local and quick to respond, and it's - * sufficient to simply wait and see whether it worked - * afterwards. - */ - } else { - sk_getaddr(addr, addrbuf, lenof(addrbuf)); - - if (type == 0) { - if (sk_addr_needs_port(addr)) { - msg = dupprintf("Connecting to %s port %d", addrbuf, port); - } else { - msg = dupprintf("Connecting to %s", addrbuf); - } - } else { - msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg); - } + /* + * While we're attempting connection sharing, don't loudly log + * everything that happens. Real TCP connections need to be logged + * when we _start_ trying to connect, because it might be ages + * before they respond if something goes wrong; but connection + * sharing is local and quick to respond, and it's sufficient to + * simply wait and see whether it worked afterwards. + */ - logevent(msg); - sfree(msg); - } + if (!ssh->attempting_connshare) + backend_socket_log(ssh->frontend, type, addr, port, + error_msg, error_code, ssh->conf, + ssh->session_started); } void ssh_connshare_log(Ssh ssh, int event, const char *logtext, @@ -3773,9 +3776,11 @@ int savedport; int ret; + random_ref(); /* platform may need this to determine share socket name */ ssh_hostport_setup(host, port, conf, &savedhost, &savedport, NULL); ret = ssh_share_test_for_upstream(savedhost, savedport, conf); sfree(savedhost); + random_unref(); return ret; } @@ -3839,10 +3844,8 @@ * Try to find host. */ addressfamily = conf_get_int(ssh->conf, CONF_addressfamily); - logeventf(ssh, "Looking up host \"%s\"%s", host, - (addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" : - (addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" : ""))); - addr = name_lookup(host, port, realhost, ssh->conf, addressfamily); + addr = name_lookup(host, port, realhost, ssh->conf, addressfamily, + ssh->frontend, "SSH connection"); if ((err = sk_addr_error(addr)) != NULL) { sk_addr_free(addr); return err; @@ -4219,6 +4222,9 @@ "rsa", keystr, fingerprint, ssh_dialog_callback, ssh); sfree(keystr); +#ifdef FUZZING + s->dlgret = 1; +#endif if (s->dlgret < 0) { do { crReturn(0); @@ -6656,6 +6662,11 @@ /* List encryption algorithms (client->server then server->client). */ for (k = KEXLIST_CSCIPHER; k <= KEXLIST_SCCIPHER; k++) { warn = FALSE; +#ifdef FUZZING + alg = ssh2_kexinit_addalg(s->kexlists[k], "none"); + alg->u.cipher.cipher = NULL; + alg->u.cipher.warn = warn; +#endif /* FUZZING */ for (i = 0; i < s->n_preferred_ciphers; i++) { const struct ssh2_ciphers *c = s->preferred_ciphers[i]; if (!c) warn = TRUE; @@ -6669,6 +6680,11 @@ } /* List MAC algorithms (client->server then server->client). */ for (j = KEXLIST_CSMAC; j <= KEXLIST_SCMAC; j++) { +#ifdef FUZZING + alg = ssh2_kexinit_addalg(s->kexlists[j], "none"); + alg->u.mac.mac = NULL; + alg->u.mac.etm = FALSE; +#endif /* FUZZING */ for (i = 0; i < s->nmacs; i++) { alg = ssh2_kexinit_addalg(s->kexlists[j], s->maclist[i]->name); alg->u.mac.mac = s->maclist[i]; @@ -6941,8 +6957,8 @@ { int csbits, scbits; - csbits = s->cscipher_tobe->real_keybits; - scbits = s->sccipher_tobe->real_keybits; + csbits = s->cscipher_tobe ? s->cscipher_tobe->real_keybits : 0; + scbits = s->sccipher_tobe ? s->sccipher_tobe->real_keybits : 0; s->nbits = (csbits > scbits ? csbits : scbits); } /* The keys only have hlen-bit entropy, since they're based on @@ -7285,12 +7301,18 @@ dmemdump(s->exchange_hash, ssh->kex->hash->hlen); #endif - if (!s->hkey || - !ssh->hostkey->verifysig(s->hkey, s->sigdata, s->siglen, + if (!s->hkey) { + bombout(("Server's host key is invalid")); + crStopV; + } + + if (!ssh->hostkey->verifysig(s->hkey, s->sigdata, s->siglen, (char *)s->exchange_hash, ssh->kex->hash->hlen)) { +#ifndef FUZZING bombout(("Server's host key did not match the signature supplied")); crStopV; +#endif } s->keystr = ssh->hostkey->fmtkey(s->hkey); @@ -7316,6 +7338,9 @@ ssh->hostkey->keytype, s->keystr, s->fingerprint, ssh_dialog_callback, ssh); +#ifdef FUZZING + s->dlgret = 1; +#endif if (s->dlgret < 0) { do { crReturnV; @@ -7348,8 +7373,10 @@ * the one we saw before. */ if (strcmp(ssh->hostkey_str, s->keystr)) { +#ifndef FUZZING bombout(("Host key was different in repeat key exchange")); crStopV; +#endif } sfree(s->keystr); } @@ -7383,13 +7410,14 @@ if (ssh->cs_cipher_ctx) ssh->cscipher->free_context(ssh->cs_cipher_ctx); ssh->cscipher = s->cscipher_tobe; - ssh->cs_cipher_ctx = ssh->cscipher->make_context(); + if (ssh->cscipher) ssh->cs_cipher_ctx = ssh->cscipher->make_context(); if (ssh->cs_mac_ctx) ssh->csmac->free_context(ssh->cs_mac_ctx); ssh->csmac = s->csmac_tobe; ssh->csmac_etm = s->csmac_etm_tobe; - ssh->cs_mac_ctx = ssh->csmac->make_context(ssh->cs_cipher_ctx); + if (ssh->csmac) + ssh->cs_mac_ctx = ssh->csmac->make_context(ssh->cs_cipher_ctx); if (ssh->cs_comp_ctx) ssh->cscomp->compress_cleanup(ssh->cs_comp_ctx); @@ -7400,7 +7428,7 @@ * Set IVs on client-to-server keys. Here we use the exchange * hash from the _first_ key exchange. */ - { + if (ssh->cscipher) { unsigned char *key; key = ssh2_mkkey(ssh, s->K, s->exchange_hash, 'C', @@ -7414,6 +7442,9 @@ ssh->cscipher->setiv(ssh->cs_cipher_ctx, key); smemclr(key, ssh->cscipher->blksize); sfree(key); + } + if (ssh->csmac) { + unsigned char *key; key = ssh2_mkkey(ssh, s->K, s->exchange_hash, 'E', ssh->csmac->keylen); @@ -7422,14 +7453,18 @@ sfree(key); } - fzprintf(sftpCipherClientToServer, ssh->cscipher->text_name); - fzprintf(sftpMacClientToServer, ssh->csmac_etm ? "%s (in ETM mode)" : "%s", ssh->csmac->text_name); - logeventf(ssh, "Initialised %.200s client->server encryption", - ssh->cscipher->text_name); - logeventf(ssh, "Initialised %.200s client->server MAC algorithm%s%s", - ssh->csmac->text_name, - ssh->csmac_etm ? " (in ETM mode)" : "", - ssh->cscipher->required_mac ? " (required by cipher)" : ""); + if (ssh->cscipher) { + fzprintf(sftpCipherClientToServer, ssh->cscipher->text_name); + logeventf(ssh, "Initialised %.200s client->server encryption", + ssh->cscipher->text_name); + } + if (ssh->csmac) { + fzprintf(sftpMacClientToServer, ssh->csmac_etm ? "%s (in ETM mode)" : "%s", ssh->csmac->text_name); + logeventf(ssh, "Initialised %.200s client->server MAC algorithm%s%s", + ssh->csmac->text_name, + ssh->csmac_etm ? " (in ETM mode)" : "", + ssh->cscipher->required_mac ? " (required by cipher)" : ""); + } if (ssh->cscomp->text_name) logeventf(ssh, "Initialised %s compression", ssh->cscomp->text_name); @@ -7457,14 +7492,18 @@ */ if (ssh->sc_cipher_ctx) ssh->sccipher->free_context(ssh->sc_cipher_ctx); - ssh->sccipher = s->sccipher_tobe; - ssh->sc_cipher_ctx = ssh->sccipher->make_context(); + if (s->sccipher_tobe) { + ssh->sccipher = s->sccipher_tobe; + ssh->sc_cipher_ctx = ssh->sccipher->make_context(); + } if (ssh->sc_mac_ctx) ssh->scmac->free_context(ssh->sc_mac_ctx); - ssh->scmac = s->scmac_tobe; - ssh->scmac_etm = s->scmac_etm_tobe; - ssh->sc_mac_ctx = ssh->scmac->make_context(ssh->sc_cipher_ctx); + if (s->scmac_tobe) { + ssh->scmac = s->scmac_tobe; + ssh->scmac_etm = s->scmac_etm_tobe; + ssh->sc_mac_ctx = ssh->scmac->make_context(ssh->sc_cipher_ctx); + } if (ssh->sc_comp_ctx) ssh->sccomp->decompress_cleanup(ssh->sc_comp_ctx); @@ -7475,7 +7514,7 @@ * Set IVs on server-to-client keys. Here we use the exchange * hash from the _first_ key exchange. */ - { + if (ssh->sccipher) { unsigned char *key; key = ssh2_mkkey(ssh, s->K, s->exchange_hash, 'D', @@ -7489,6 +7528,9 @@ ssh->sccipher->setiv(ssh->sc_cipher_ctx, key); smemclr(key, ssh->sccipher->blksize); sfree(key); + } + if (ssh->scmac) { + unsigned char *key; key = ssh2_mkkey(ssh, s->K, s->exchange_hash, 'F', ssh->scmac->keylen); @@ -7496,14 +7538,18 @@ smemclr(key, ssh->scmac->keylen); sfree(key); } - fzprintf(sftpCipherServerToClient, ssh->sccipher->text_name); - fzprintf(sftpMacServerToClient, ssh->scmac_etm ? "%s (in ETM mode)" : "%s", ssh->scmac->text_name); - logeventf(ssh, "Initialised %.200s server->client encryption", - ssh->sccipher->text_name); - logeventf(ssh, "Initialised %.200s server->client MAC algorithm%s%s", - ssh->scmac->text_name, - ssh->scmac_etm ? " (in ETM mode)" : "", - ssh->sccipher->required_mac ? " (required by cipher)" : ""); + if (ssh->sccipher) { + fzprintf(sftpCipherServerToClient, ssh->sccipher->text_name); + logeventf(ssh, "Initialised %.200s server->client encryption", + ssh->sccipher->text_name); + } + if (ssh->scmac) { + fzprintf(sftpMacServerToClient, ssh->scmac_etm ? "%s (in ETM mode)" : "%s", ssh->scmac->text_name); + logeventf(ssh, "Initialised %.200s server->client MAC algorithm%s%s", + ssh->scmac->text_name, + ssh->scmac_etm ? " (in ETM mode)" : "", + ssh->sccipher->required_mac ? " (required by cipher)" : ""); + } if (ssh->sccomp->text_name) logeventf(ssh, "Initialised %s decompression", ssh->sccomp->text_name); @@ -11341,6 +11387,7 @@ ssh->X11_fwd_enabled = FALSE; ssh->connshare = NULL; ssh->attempting_connshare = FALSE; + ssh->session_started = FALSE; *backend_handle = ssh; diff -Nru filezilla-3.14.1/src/putty/sshccp.c filezilla-3.15.0.2/src/putty/sshccp.c --- filezilla-3.14.1/src/putty/sshccp.c 2015-09-10 09:37:18.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshccp.c 2016-02-05 08:54:46.000000000 +0000 @@ -211,814 +211,527 @@ } /* - * Addition of bigvals, not mod p. + * Core functions to do arithmetic mod p = 2^130-5. The whole + * collection of these, up to and including the surrounding #if, are + * generated automatically for various sizes of BignumInt by + * contrib/make1305.py. */ + +#if BIGNUM_INT_BITS == 16 + static void bigval_add(bigval *r, const bigval *a, const bigval *b) { -#if BIGNUM_INT_BITS == 64 - /* ./contrib/make1305.py add 64 */ - BignumDblInt acclo; - acclo = 0; - acclo += a->w[0]; - acclo += b->w[0]; - r->w[0] = acclo; - acclo >>= 64; - acclo += a->w[1]; - acclo += b->w[1]; - r->w[1] = acclo; - acclo >>= 64; - acclo += a->w[2]; - acclo += b->w[2]; - r->w[2] = acclo; - acclo >>= 64; -#elif BIGNUM_INT_BITS == 32 - /* ./contrib/make1305.py add 32 */ - BignumDblInt acclo; - acclo = 0; - acclo += a->w[0]; - acclo += b->w[0]; - r->w[0] = acclo; - acclo >>= 32; - acclo += a->w[1]; - acclo += b->w[1]; - r->w[1] = acclo; - acclo >>= 32; - acclo += a->w[2]; - acclo += b->w[2]; - r->w[2] = acclo; - acclo >>= 32; - acclo += a->w[3]; - acclo += b->w[3]; - r->w[3] = acclo; - acclo >>= 32; - acclo += a->w[4]; - acclo += b->w[4]; - r->w[4] = acclo; - acclo >>= 32; -#elif BIGNUM_INT_BITS == 16 - /* ./contrib/make1305.py add 16 */ - BignumDblInt acclo; - acclo = 0; - acclo += a->w[0]; - acclo += b->w[0]; - r->w[0] = acclo; - acclo >>= 16; - acclo += a->w[1]; - acclo += b->w[1]; - r->w[1] = acclo; - acclo >>= 16; - acclo += a->w[2]; - acclo += b->w[2]; - r->w[2] = acclo; - acclo >>= 16; - acclo += a->w[3]; - acclo += b->w[3]; - r->w[3] = acclo; - acclo >>= 16; - acclo += a->w[4]; - acclo += b->w[4]; - r->w[4] = acclo; - acclo >>= 16; - acclo += a->w[5]; - acclo += b->w[5]; - r->w[5] = acclo; - acclo >>= 16; - acclo += a->w[6]; - acclo += b->w[6]; - r->w[6] = acclo; - acclo >>= 16; - acclo += a->w[7]; - acclo += b->w[7]; - r->w[7] = acclo; - acclo >>= 16; - acclo += a->w[8]; - acclo += b->w[8]; - r->w[8] = acclo; - acclo >>= 16; -#else -#error Run contrib/make1305.py again with a different bit count -#endif + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14; + BignumInt v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = a->w[3]; + v4 = a->w[4]; + v5 = a->w[5]; + v6 = a->w[6]; + v7 = a->w[7]; + v8 = a->w[8]; + v9 = b->w[0]; + v10 = b->w[1]; + v11 = b->w[2]; + v12 = b->w[3]; + v13 = b->w[4]; + v14 = b->w[5]; + v15 = b->w[6]; + v16 = b->w[7]; + v17 = b->w[8]; + BignumADC(v18, carry, v0, v9, 0); + BignumADC(v19, carry, v1, v10, carry); + BignumADC(v20, carry, v2, v11, carry); + BignumADC(v21, carry, v3, v12, carry); + BignumADC(v22, carry, v4, v13, carry); + BignumADC(v23, carry, v5, v14, carry); + BignumADC(v24, carry, v6, v15, carry); + BignumADC(v25, carry, v7, v16, carry); + v26 = v8 + v17 + carry; + r->w[0] = v18; + r->w[1] = v19; + r->w[2] = v20; + r->w[3] = v21; + r->w[4] = v22; + r->w[5] = v23; + r->w[6] = v24; + r->w[7] = v25; + r->w[8] = v26; } -/* - * Multiplication of bigvals mod p. Uses r as temporary storage, so - * don't pass r aliasing a or b. - */ static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b) { -#if BIGNUM_INT_BITS == 64 - /* ./contrib/make1305.py mul 64 */ - BignumDblInt tmp; - BignumDblInt acclo; - BignumDblInt acchi; - BignumDblInt acc2lo; - acclo = 0; - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - r->w[0] = acclo; - acclo = acchi + (acclo >> 64); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - tmp = (BignumDblInt)(a->w[1]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - r->w[1] = acclo; - acclo = acchi + (acclo >> 64); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - tmp = (BignumDblInt)(a->w[1]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - tmp = (BignumDblInt)(a->w[2]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - r->w[2] = acclo & (((BignumInt)1 << 2)-1); - acc2lo = 0; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 62)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 64); - acchi = 0; - tmp = (BignumDblInt)(a->w[1]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - tmp = (BignumDblInt)(a->w[2]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 62); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 64; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 62)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 64); - acchi = 0; - tmp = (BignumDblInt)(a->w[2]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 64; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 62); - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 64; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 0); - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo = 0; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 60)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 64); - acchi = 0; - acc2lo += (acclo & (((BignumInt)1 << 4)-1)) * ((BignumDblInt)25 << 60); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 64; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 60)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 64); - acchi = 0; - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 64; - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo >>= 64; -#elif BIGNUM_INT_BITS == 32 - /* ./contrib/make1305.py mul 32 */ - BignumDblInt tmp; - BignumDblInt acclo; - BignumDblInt acchi; - BignumDblInt acc2lo; - acclo = 0; - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - r->w[0] = acclo; - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[1]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - r->w[1] = acclo; - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[1]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[2]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - r->w[2] = acclo; - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[1]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[2]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[3]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - r->w[3] = acclo; - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[1]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[2]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[3]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[4]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - r->w[4] = acclo & (((BignumInt)1 << 2)-1); - acc2lo = 0; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 30)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[1]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[2]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[3]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[4]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 30); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 32; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 30)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[2]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[3]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[4]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 30); - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 32; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 30)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[3]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - tmp = (BignumDblInt)(a->w[4]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 30); - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo >>= 32; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 30)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - tmp = (BignumDblInt)(a->w[4]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 32; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 30); - acc2lo += r->w[3]; - r->w[3] = acc2lo; - acc2lo >>= 32; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 0); - acc2lo += r->w[4]; - r->w[4] = acc2lo; - acc2lo = 0; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 28)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - acc2lo += (acclo & (((BignumInt)1 << 4)-1)) * ((BignumDblInt)25 << 28); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 32; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 28)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 32); - acchi = 0; - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 32; - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo >>= 32; - acc2lo += r->w[3]; - r->w[3] = acc2lo; - acc2lo >>= 32; - acc2lo += r->w[4]; - r->w[4] = acc2lo; - acc2lo >>= 32; -#elif BIGNUM_INT_BITS == 16 - /* ./contrib/make1305.py mul 16 */ - BignumDblInt tmp; - BignumDblInt acclo; - BignumDblInt acchi; - BignumDblInt acc2lo; - acclo = 0; - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[0] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[1] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[2] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[3] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[4] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[5] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[6] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[7] = acclo; - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[0]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[1]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[0]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - r->w[8] = acclo & (((BignumInt)1 << 2)-1); - acc2lo = 0; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[1]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[2]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[1]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[2]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[3]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[2]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[3]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[4]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[3]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[4]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[5]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[4]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[3]; - r->w[3] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[5]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[6]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[5]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[4]; - r->w[4] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[6]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[7]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[6]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[5]; - r->w[5] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[7]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - tmp = (BignumDblInt)(a->w[8]) * (b->w[7]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[6]; - r->w[6] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 14)-1)) * ((BignumDblInt)5 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - tmp = (BignumDblInt)(a->w[8]) * (b->w[8]); - acclo += tmp & BIGNUM_INT_MASK; - acchi += tmp >> 16; - acc2lo += (acclo & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 14); - acc2lo += r->w[7]; - r->w[7] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 2) & (((BignumInt)1 << 2)-1)) * ((BignumDblInt)5 << 0); - acc2lo += r->w[8]; - r->w[8] = acc2lo; - acc2lo = 0; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 12)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - acc2lo += (acclo & (((BignumInt)1 << 4)-1)) * ((BignumDblInt)25 << 12); - acc2lo += r->w[0]; - r->w[0] = acc2lo; - acc2lo >>= 16; - acc2lo += ((acclo >> 4) & (((BignumInt)1 << 12)-1)) * ((BignumDblInt)25 << 0); - acclo = acchi + (acclo >> 16); - acchi = 0; - acc2lo += r->w[1]; - r->w[1] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[2]; - r->w[2] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[3]; - r->w[3] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[4]; - r->w[4] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[5]; - r->w[5] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[6]; - r->w[6] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[7]; - r->w[7] = acc2lo; - acc2lo >>= 16; - acc2lo += r->w[8]; - r->w[8] = acc2lo; - acc2lo >>= 16; -#else -#error Run contrib/make1305.py again with a different bit count -#endif + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14; + BignumInt v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27; + BignumInt v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40; + BignumInt v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53; + BignumInt v54, v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66; + BignumInt v67, v68, v69, v70, v71, v72, v73, v74, v75, v76, v77, v78, v79; + BignumInt v80, v81, v82, v83, v84, v85, v86, v87, v88, v89, v90, v91, v92; + BignumInt v93, v94, v95, v96, v97, v98, v99, v100, v101, v102, v103, v104; + BignumInt v105, v106, v107, v108, v109, v110, v111, v112, v113, v114; + BignumInt v115, v116, v117, v118, v119, v120, v121, v122, v123, v124; + BignumInt v125, v126, v127, v128, v129, v130, v131, v132, v133, v134; + BignumInt v135, v136, v137, v138, v139, v140, v141, v142, v143, v144; + BignumInt v145, v146, v147, v148, v149, v150, v151, v152, v153, v154; + BignumInt v155, v156, v157, v158, v159, v160, v161, v162, v163, v164; + BignumInt v165, v166, v167, v168, v169, v170, v171, v172, v173, v174; + BignumInt v175, v176, v177, v178, v180, v181, v182, v183, v184, v185; + BignumInt v186, v187, v188, v189, v190, v191, v192, v193, v194, v195; + BignumInt v196, v197, v198, v199, v200, v201, v202, v203, v204, v205; + BignumInt v206, v207, v208, v210, v212, v213, v214, v215, v216, v217; + BignumInt v218, v219, v220, v221, v222, v223, v224, v225, v226, v227; + BignumInt v228, v229; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = a->w[3]; + v4 = a->w[4]; + v5 = a->w[5]; + v6 = a->w[6]; + v7 = a->w[7]; + v8 = a->w[8]; + v9 = b->w[0]; + v10 = b->w[1]; + v11 = b->w[2]; + v12 = b->w[3]; + v13 = b->w[4]; + v14 = b->w[5]; + v15 = b->w[6]; + v16 = b->w[7]; + v17 = b->w[8]; + BignumMUL(v19, v18, v0, v9); + BignumMULADD(v21, v20, v0, v10, v19); + BignumMULADD(v23, v22, v0, v11, v21); + BignumMULADD(v25, v24, v0, v12, v23); + BignumMULADD(v27, v26, v0, v13, v25); + BignumMULADD(v29, v28, v0, v14, v27); + BignumMULADD(v31, v30, v0, v15, v29); + BignumMULADD(v33, v32, v0, v16, v31); + BignumMULADD(v35, v34, v0, v17, v33); + BignumMULADD(v37, v36, v1, v9, v20); + BignumMULADD2(v39, v38, v1, v10, v22, v37); + BignumMULADD2(v41, v40, v1, v11, v24, v39); + BignumMULADD2(v43, v42, v1, v12, v26, v41); + BignumMULADD2(v45, v44, v1, v13, v28, v43); + BignumMULADD2(v47, v46, v1, v14, v30, v45); + BignumMULADD2(v49, v48, v1, v15, v32, v47); + BignumMULADD2(v51, v50, v1, v16, v34, v49); + BignumMULADD2(v53, v52, v1, v17, v35, v51); + BignumMULADD(v55, v54, v2, v9, v38); + BignumMULADD2(v57, v56, v2, v10, v40, v55); + BignumMULADD2(v59, v58, v2, v11, v42, v57); + BignumMULADD2(v61, v60, v2, v12, v44, v59); + BignumMULADD2(v63, v62, v2, v13, v46, v61); + BignumMULADD2(v65, v64, v2, v14, v48, v63); + BignumMULADD2(v67, v66, v2, v15, v50, v65); + BignumMULADD2(v69, v68, v2, v16, v52, v67); + BignumMULADD2(v71, v70, v2, v17, v53, v69); + BignumMULADD(v73, v72, v3, v9, v56); + BignumMULADD2(v75, v74, v3, v10, v58, v73); + BignumMULADD2(v77, v76, v3, v11, v60, v75); + BignumMULADD2(v79, v78, v3, v12, v62, v77); + BignumMULADD2(v81, v80, v3, v13, v64, v79); + BignumMULADD2(v83, v82, v3, v14, v66, v81); + BignumMULADD2(v85, v84, v3, v15, v68, v83); + BignumMULADD2(v87, v86, v3, v16, v70, v85); + BignumMULADD2(v89, v88, v3, v17, v71, v87); + BignumMULADD(v91, v90, v4, v9, v74); + BignumMULADD2(v93, v92, v4, v10, v76, v91); + BignumMULADD2(v95, v94, v4, v11, v78, v93); + BignumMULADD2(v97, v96, v4, v12, v80, v95); + BignumMULADD2(v99, v98, v4, v13, v82, v97); + BignumMULADD2(v101, v100, v4, v14, v84, v99); + BignumMULADD2(v103, v102, v4, v15, v86, v101); + BignumMULADD2(v105, v104, v4, v16, v88, v103); + BignumMULADD2(v107, v106, v4, v17, v89, v105); + BignumMULADD(v109, v108, v5, v9, v92); + BignumMULADD2(v111, v110, v5, v10, v94, v109); + BignumMULADD2(v113, v112, v5, v11, v96, v111); + BignumMULADD2(v115, v114, v5, v12, v98, v113); + BignumMULADD2(v117, v116, v5, v13, v100, v115); + BignumMULADD2(v119, v118, v5, v14, v102, v117); + BignumMULADD2(v121, v120, v5, v15, v104, v119); + BignumMULADD2(v123, v122, v5, v16, v106, v121); + BignumMULADD2(v125, v124, v5, v17, v107, v123); + BignumMULADD(v127, v126, v6, v9, v110); + BignumMULADD2(v129, v128, v6, v10, v112, v127); + BignumMULADD2(v131, v130, v6, v11, v114, v129); + BignumMULADD2(v133, v132, v6, v12, v116, v131); + BignumMULADD2(v135, v134, v6, v13, v118, v133); + BignumMULADD2(v137, v136, v6, v14, v120, v135); + BignumMULADD2(v139, v138, v6, v15, v122, v137); + BignumMULADD2(v141, v140, v6, v16, v124, v139); + BignumMULADD2(v143, v142, v6, v17, v125, v141); + BignumMULADD(v145, v144, v7, v9, v128); + BignumMULADD2(v147, v146, v7, v10, v130, v145); + BignumMULADD2(v149, v148, v7, v11, v132, v147); + BignumMULADD2(v151, v150, v7, v12, v134, v149); + BignumMULADD2(v153, v152, v7, v13, v136, v151); + BignumMULADD2(v155, v154, v7, v14, v138, v153); + BignumMULADD2(v157, v156, v7, v15, v140, v155); + BignumMULADD2(v159, v158, v7, v16, v142, v157); + BignumMULADD2(v161, v160, v7, v17, v143, v159); + BignumMULADD(v163, v162, v8, v9, v146); + BignumMULADD2(v165, v164, v8, v10, v148, v163); + BignumMULADD2(v167, v166, v8, v11, v150, v165); + BignumMULADD2(v169, v168, v8, v12, v152, v167); + BignumMULADD2(v171, v170, v8, v13, v154, v169); + BignumMULADD2(v173, v172, v8, v14, v156, v171); + BignumMULADD2(v175, v174, v8, v15, v158, v173); + BignumMULADD2(v177, v176, v8, v16, v160, v175); + v178 = v8 * v17 + v161 + v177; + v180 = (v162) & ((((BignumInt)1) << 2)-1); + v181 = ((v162) >> 2) | ((v164) << 14); + v182 = ((v164) >> 2) | ((v166) << 14); + v183 = ((v166) >> 2) | ((v168) << 14); + v184 = ((v168) >> 2) | ((v170) << 14); + v185 = ((v170) >> 2) | ((v172) << 14); + v186 = ((v172) >> 2) | ((v174) << 14); + v187 = ((v174) >> 2) | ((v176) << 14); + v188 = ((v176) >> 2) | ((v178) << 14); + v189 = (v178) >> 2; + v190 = (v189) & ((((BignumInt)1) << 2)-1); + v191 = (v178) >> 4; + BignumMUL(v193, v192, 5, v181); + BignumMULADD(v195, v194, 5, v182, v193); + BignumMULADD(v197, v196, 5, v183, v195); + BignumMULADD(v199, v198, 5, v184, v197); + BignumMULADD(v201, v200, 5, v185, v199); + BignumMULADD(v203, v202, 5, v186, v201); + BignumMULADD(v205, v204, 5, v187, v203); + BignumMULADD(v207, v206, 5, v188, v205); + v208 = 5 * v190 + v207; + v210 = 25 * v191; + BignumADC(v212, carry, v18, v192, 0); + BignumADC(v213, carry, v36, v194, carry); + BignumADC(v214, carry, v54, v196, carry); + BignumADC(v215, carry, v72, v198, carry); + BignumADC(v216, carry, v90, v200, carry); + BignumADC(v217, carry, v108, v202, carry); + BignumADC(v218, carry, v126, v204, carry); + BignumADC(v219, carry, v144, v206, carry); + v220 = v180 + v208 + carry; + BignumADC(v221, carry, v212, v210, 0); + BignumADC(v222, carry, v213, 0, carry); + BignumADC(v223, carry, v214, 0, carry); + BignumADC(v224, carry, v215, 0, carry); + BignumADC(v225, carry, v216, 0, carry); + BignumADC(v226, carry, v217, 0, carry); + BignumADC(v227, carry, v218, 0, carry); + BignumADC(v228, carry, v219, 0, carry); + v229 = v220 + 0 + carry; + r->w[0] = v221; + r->w[1] = v222; + r->w[2] = v223; + r->w[3] = v224; + r->w[4] = v225; + r->w[5] = v226; + r->w[6] = v227; + r->w[7] = v228; + r->w[8] = v229; } static void bigval_final_reduce(bigval *n) { -#if BIGNUM_INT_BITS == 64 - /* ./contrib/make1305.py final_reduce 64 */ - BignumDblInt acclo; - acclo = 0; - acclo += 5 * ((n->w[2] >> 2) + 1); - acclo += n->w[0]; - acclo >>= 64; - acclo += n->w[1]; - acclo >>= 64; - acclo += n->w[2]; - acclo = 5 * (acclo >> 2); - acclo += n->w[0]; - n->w[0] = acclo; - acclo >>= 64; - acclo += n->w[1]; - n->w[1] = acclo; - acclo >>= 64; - acclo += n->w[2]; - n->w[2] = acclo; - acclo >>= 64; - n->w[2] &= (1 << 2) - 1; + 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; + BignumCarry carry; + + v0 = n->w[0]; + v1 = n->w[1]; + v2 = n->w[2]; + v3 = n->w[3]; + v4 = n->w[4]; + v5 = n->w[5]; + v6 = n->w[6]; + 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; +} + #elif BIGNUM_INT_BITS == 32 - /* ./contrib/make1305.py final_reduce 32 */ - BignumDblInt acclo; - acclo = 0; - acclo += 5 * ((n->w[4] >> 2) + 1); - acclo += n->w[0]; - acclo >>= 32; - acclo += n->w[1]; - acclo >>= 32; - acclo += n->w[2]; - acclo >>= 32; - acclo += n->w[3]; - acclo >>= 32; - acclo += n->w[4]; - acclo = 5 * (acclo >> 2); - acclo += n->w[0]; - n->w[0] = acclo; - acclo >>= 32; - acclo += n->w[1]; - n->w[1] = acclo; - acclo >>= 32; - acclo += n->w[2]; - n->w[2] = acclo; - acclo >>= 32; - acclo += n->w[3]; - n->w[3] = acclo; - acclo >>= 32; - acclo += n->w[4]; - n->w[4] = acclo; - acclo >>= 32; - n->w[4] &= (1 << 2) - 1; -#elif BIGNUM_INT_BITS == 16 - /* ./contrib/make1305.py final_reduce 16 */ - BignumDblInt acclo; - acclo = 0; - acclo += 5 * ((n->w[8] >> 2) + 1); - acclo += n->w[0]; - acclo >>= 16; - acclo += n->w[1]; - acclo >>= 16; - acclo += n->w[2]; - acclo >>= 16; - acclo += n->w[3]; - acclo >>= 16; - acclo += n->w[4]; - acclo >>= 16; - acclo += n->w[5]; - acclo >>= 16; - acclo += n->w[6]; - acclo >>= 16; - acclo += n->w[7]; - acclo >>= 16; - acclo += n->w[8]; - acclo = 5 * (acclo >> 2); - acclo += n->w[0]; - n->w[0] = acclo; - acclo >>= 16; - acclo += n->w[1]; - n->w[1] = acclo; - acclo >>= 16; - acclo += n->w[2]; - n->w[2] = acclo; - acclo >>= 16; - acclo += n->w[3]; - n->w[3] = acclo; - acclo >>= 16; - acclo += n->w[4]; - n->w[4] = acclo; - acclo >>= 16; - acclo += n->w[5]; - n->w[5] = acclo; - acclo >>= 16; - acclo += n->w[6]; - n->w[6] = acclo; - acclo >>= 16; - acclo += n->w[7]; - n->w[7] = acclo; - acclo >>= 16; - acclo += n->w[8]; - n->w[8] = acclo; - acclo >>= 16; - n->w[8] &= (1 << 2) - 1; + +static void bigval_add(bigval *r, const bigval *a, const bigval *b) +{ + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = a->w[3]; + v4 = a->w[4]; + v5 = b->w[0]; + v6 = b->w[1]; + v7 = b->w[2]; + v8 = b->w[3]; + v9 = b->w[4]; + BignumADC(v10, carry, v0, v5, 0); + BignumADC(v11, carry, v1, v6, carry); + BignumADC(v12, carry, v2, v7, carry); + BignumADC(v13, carry, v3, v8, carry); + v14 = v4 + v9 + carry; + r->w[0] = v10; + r->w[1] = v11; + r->w[2] = v12; + r->w[3] = v13; + r->w[4] = v14; +} + +static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b) +{ + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14; + BignumInt v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27; + BignumInt v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40; + BignumInt v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53; + BignumInt v54, v55, v56, v57, v58, v60, v61, v62, v63, v64, v65, v66, v67; + BignumInt v68, v69, v70, v71, v72, v73, v74, v75, v76, v78, v80, v81, v82; + BignumInt v83, v84, v85, v86, v87, v88, v89; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = a->w[3]; + v4 = a->w[4]; + v5 = b->w[0]; + v6 = b->w[1]; + v7 = b->w[2]; + v8 = b->w[3]; + v9 = b->w[4]; + BignumMUL(v11, v10, v0, v5); + BignumMULADD(v13, v12, v0, v6, v11); + BignumMULADD(v15, v14, v0, v7, v13); + BignumMULADD(v17, v16, v0, v8, v15); + BignumMULADD(v19, v18, v0, v9, v17); + BignumMULADD(v21, v20, v1, v5, v12); + BignumMULADD2(v23, v22, v1, v6, v14, v21); + BignumMULADD2(v25, v24, v1, v7, v16, v23); + BignumMULADD2(v27, v26, v1, v8, v18, v25); + BignumMULADD2(v29, v28, v1, v9, v19, v27); + BignumMULADD(v31, v30, v2, v5, v22); + BignumMULADD2(v33, v32, v2, v6, v24, v31); + BignumMULADD2(v35, v34, v2, v7, v26, v33); + BignumMULADD2(v37, v36, v2, v8, v28, v35); + BignumMULADD2(v39, v38, v2, v9, v29, v37); + BignumMULADD(v41, v40, v3, v5, v32); + BignumMULADD2(v43, v42, v3, v6, v34, v41); + BignumMULADD2(v45, v44, v3, v7, v36, v43); + BignumMULADD2(v47, v46, v3, v8, v38, v45); + BignumMULADD2(v49, v48, v3, v9, v39, v47); + BignumMULADD(v51, v50, v4, v5, v42); + BignumMULADD2(v53, v52, v4, v6, v44, v51); + BignumMULADD2(v55, v54, v4, v7, v46, v53); + BignumMULADD2(v57, v56, v4, v8, v48, v55); + v58 = v4 * v9 + v49 + v57; + v60 = (v50) & ((((BignumInt)1) << 2)-1); + v61 = ((v50) >> 2) | ((v52) << 30); + v62 = ((v52) >> 2) | ((v54) << 30); + v63 = ((v54) >> 2) | ((v56) << 30); + v64 = ((v56) >> 2) | ((v58) << 30); + v65 = (v58) >> 2; + v66 = (v65) & ((((BignumInt)1) << 2)-1); + v67 = (v58) >> 4; + BignumMUL(v69, v68, 5, v61); + BignumMULADD(v71, v70, 5, v62, v69); + BignumMULADD(v73, v72, 5, v63, v71); + BignumMULADD(v75, v74, 5, v64, v73); + v76 = 5 * v66 + v75; + v78 = 25 * v67; + BignumADC(v80, carry, v10, v68, 0); + BignumADC(v81, carry, v20, v70, carry); + BignumADC(v82, carry, v30, v72, carry); + BignumADC(v83, carry, v40, v74, carry); + v84 = v60 + v76 + carry; + BignumADC(v85, carry, v80, v78, 0); + BignumADC(v86, carry, v81, 0, carry); + BignumADC(v87, carry, v82, 0, carry); + BignumADC(v88, carry, v83, 0, carry); + v89 = v84 + 0 + carry; + r->w[0] = v85; + r->w[1] = v86; + r->w[2] = v87; + r->w[3] = v88; + r->w[4] = v89; +} + +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; + BignumCarry carry; + + v0 = n->w[0]; + v1 = n->w[1]; + v2 = n->w[2]; + 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; +} + +#elif BIGNUM_INT_BITS == 64 + +static void bigval_add(bigval *r, const bigval *a, const bigval *b) +{ + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = b->w[0]; + v4 = b->w[1]; + v5 = b->w[2]; + BignumADC(v6, carry, v0, v3, 0); + BignumADC(v7, carry, v1, v4, carry); + v8 = v2 + v5 + carry; + r->w[0] = v6; + r->w[1] = v7; + r->w[2] = v8; +} + +static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b) +{ + BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14; + BignumInt v15, v16, v17, v18, v19, v20, v21, v22, v24, v25, v26, v27, v28; + BignumInt v29, v30, v31, v32, v33, v34, v36, v38, v39, v40, v41, v42, v43; + BignumCarry carry; + + v0 = a->w[0]; + v1 = a->w[1]; + v2 = a->w[2]; + v3 = b->w[0]; + v4 = b->w[1]; + v5 = b->w[2]; + BignumMUL(v7, v6, v0, v3); + BignumMULADD(v9, v8, v0, v4, v7); + BignumMULADD(v11, v10, v0, v5, v9); + BignumMULADD(v13, v12, v1, v3, v8); + BignumMULADD2(v15, v14, v1, v4, v10, v13); + BignumMULADD2(v17, v16, v1, v5, v11, v15); + BignumMULADD(v19, v18, v2, v3, v14); + BignumMULADD2(v21, v20, v2, v4, v16, v19); + v22 = v2 * v5 + v17 + v21; + v24 = (v18) & ((((BignumInt)1) << 2)-1); + v25 = ((v18) >> 2) | ((v20) << 62); + v26 = ((v20) >> 2) | ((v22) << 62); + v27 = (v22) >> 2; + v28 = (v27) & ((((BignumInt)1) << 2)-1); + v29 = (v22) >> 4; + BignumMUL(v31, v30, 5, v25); + BignumMULADD(v33, v32, 5, v26, v31); + v34 = 5 * v28 + v33; + v36 = 25 * v29; + BignumADC(v38, carry, v6, v30, 0); + BignumADC(v39, carry, v12, v32, carry); + v40 = v24 + v34 + carry; + BignumADC(v41, carry, v38, v36, 0); + BignumADC(v42, carry, v39, 0, carry); + v43 = v40 + 0 + carry; + r->w[0] = v41; + r->w[1] = v42; + r->w[2] = v43; +} + +static void bigval_final_reduce(bigval *n) +{ + BignumInt v0, v1, v2, v3, v4, v6, v7, v8, v9, v10, v12, v13, v14, v15; + 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; +} + #else -#error Run contrib/make1305.py again with a different bit count +#error Add another bit count to contrib/make1305.py and rerun it #endif -} struct poly1305 { unsigned char nonce[16]; diff -Nru filezilla-3.14.1/src/putty/sshecc.c filezilla-3.15.0.2/src/putty/sshecc.c --- filezilla-3.14.1/src/putty/sshecc.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshecc.c 2016-02-05 08:54:46.000000000 +0000 @@ -1648,6 +1648,7 @@ /* Read x bit and then reset it */ negative = bignum_bit(point->y, point->curve->fieldBits - 1); bignum_set_bit(point->y, point->curve->fieldBits - 1, 0); + bn_restore_invariant(point->y); /* Get the x from the y */ point->x = ecp_edx(point->curve, point->y); @@ -1770,6 +1771,7 @@ /* Curve name is duplicated for Weierstrass form */ if (curve->type == EC_WEIERSTRASS) { getstring(&data, &len, &p, &slen); + if (!p) return NULL; if (!match_ssh_id(slen, p, curve->name)) return NULL; } @@ -1781,11 +1783,11 @@ ec->publicKey.x = NULL; ec->publicKey.y = NULL; ec->publicKey.z = NULL; + ec->privateKey = NULL; if (!getmppoint(&data, &len, &ec->publicKey)) { ecdsa_freekey(ec); return NULL; } - ec->privateKey = NULL; if (!ec->publicKey.x || !ec->publicKey.y || bignum_cmp(ec->publicKey.x, curve->p) >= 0 || @@ -2266,6 +2268,7 @@ } getstring(&sig, &siglen, &p, &slen); + if (!p) return 0; if (ec->publicKey.curve->type == EC_EDWARDS) { struct ec_point *r; Bignum s, h; diff -Nru filezilla-3.14.1/src/putty/sshrand.c filezilla-3.15.0.2/src/putty/sshrand.c --- filezilla-3.14.1/src/putty/sshrand.c 2014-12-18 15:15:44.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshrand.c 2016-02-05 08:54:46.000000000 +0000 @@ -45,8 +45,23 @@ int stir_pending; }; -static struct RandPool pool; int random_active = 0; + +#ifdef FUZZING +/* + * Special dummy version of the RNG for use when fuzzing. + */ +void random_add_noise(void *noise, int length) { } +void random_add_heavynoise(void *noise, int length) { } +void random_ref(void) { } +void random_unref(void) { } +int random_byte(void) +{ + return 0x45; /* Chosen by eight fair coin tosses */ +} +void random_get_savedata(void **data, int *len) { } +#else /* !FUZZING */ +static struct RandPool pool; long next_noise_collection; #ifdef RANDOM_DIAGNOSTICS @@ -326,3 +341,4 @@ *data = buf; random_stir(); } +#endif diff -Nru filezilla-3.14.1/src/putty/sshrsa.c filezilla-3.15.0.2/src/putty/sshrsa.c --- filezilla-3.14.1/src/putty/sshrsa.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshrsa.c 2016-02-05 08:54:46.000000000 +0000 @@ -773,6 +773,8 @@ int ret; rsa = rsa2_newkey(self, (const char *) blob, len); + if (!rsa) + return -1; ret = bignum_bitcount(rsa->modulus); rsa2_freekey(rsa); diff -Nru filezilla-3.14.1/src/putty/sshsh512.c filezilla-3.15.0.2/src/putty/sshsh512.c --- filezilla-3.14.1/src/putty/sshsh512.c 2015-08-22 09:28:47.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/sshsh512.c 2016-02-05 08:54:46.000000000 +0000 @@ -72,6 +72,7 @@ s->h[i] = iv[i]; } +#ifndef SHA512_STANDALONE static void SHA384_Core_Init(SHA512_State *s) { static const uint64 iv[] = { INIT(0xcbbb9d5d, 0xc1059ed8), @@ -87,6 +88,7 @@ for (i = 0; i < 8; i++) s->h[i] = iv[i]; } +#endif static void SHA512_Block(SHA512_State *s, uint64 *block) { uint64 w[80]; diff -Nru filezilla-3.14.1/src/putty/unix/Makefile.in filezilla-3.15.0.2/src/putty/unix/Makefile.in --- filezilla-3.14.1/src/putty/unix/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/unix/Makefile.in 2016-02-10 19:38:52.000000000 +0000 @@ -244,6 +244,8 @@ 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@ diff -Nru filezilla-3.14.1/src/putty/unix/unix.h filezilla-3.15.0.2/src/putty/unix/unix.h --- filezilla-3.14.1/src/putty/unix/unix.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/unix/unix.h 2016-02-05 08:54:46.000000000 +0000 @@ -134,7 +134,7 @@ int reallyclose(void *frontend); #ifdef MAY_REFER_TO_GTK_IN_HEADERS int messagebox(GtkWidget *parentwin, const char *title, - const char *msg, int minwid, ...); + const char *msg, int minwid, int selectable, ...); #endif /* Things pterm.c needs from {ptermm,uxputty}.c */ diff -Nru filezilla-3.14.1/src/putty/unix/uxproxy.c filezilla-3.15.0.2/src/putty/unix/uxproxy.c --- filezilla-3.14.1/src/putty/unix/uxproxy.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/unix/uxproxy.c 2016-02-05 08:54:46.000000000 +0000 @@ -21,7 +21,7 @@ const struct socket_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ - int to_cmd, from_cmd; /* fds */ + int to_cmd, from_cmd, cmd_err; /* fds */ char *error; @@ -29,6 +29,7 @@ bufchain pending_output_data; bufchain pending_input_data; + bufchain pending_error_data; enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof; }; @@ -37,7 +38,9 @@ /* * Trees to look up the pipe fds in. */ -static tree234 *localproxy_by_fromfd, *localproxy_by_tofd; +static tree234 *localproxy_by_fromfd; +static tree234 *localproxy_by_tofd; +static tree234 *localproxy_by_errfd; static int localproxy_fromfd_cmp(void *av, void *bv) { Local_Proxy_Socket a = (Local_Proxy_Socket)av; @@ -78,6 +81,26 @@ return +1; return 0; } +static int localproxy_errfd_cmp(void *av, void *bv) +{ + Local_Proxy_Socket a = (Local_Proxy_Socket)av; + Local_Proxy_Socket b = (Local_Proxy_Socket)bv; + if (a->cmd_err < b->cmd_err) + return -1; + if (a->cmd_err > b->cmd_err) + return +1; + return 0; +} +static int localproxy_errfd_find(void *av, void *bv) +{ + int a = *(int *)av; + Local_Proxy_Socket b = (Local_Proxy_Socket)bv; + if (a < b->cmd_err) + return -1; + if (a > b->cmd_err) + return +1; + return 0; +} /* basic proxy socket functions */ @@ -104,6 +127,14 @@ uxsel_del(ps->from_cmd); close(ps->from_cmd); + del234(localproxy_by_errfd, ps); + uxsel_del(ps->cmd_err); + close(ps->cmd_err); + + bufchain_clear(&ps->pending_input_data); + bufchain_clear(&ps->pending_output_data); + bufchain_clear(&ps->pending_error_data); + sfree(ps); } @@ -207,19 +238,26 @@ int ret; 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 */ if (event == 1) { - assert(fd == s->from_cmd); - ret = read(fd, buf, sizeof(buf)); - if (ret < 0) { - return plug_closing(s->plug, strerror(errno), errno, 0); - } else if (ret == 0) { - return plug_closing(s->plug, NULL, 0, 0); - } else { - return plug_receive(s->plug, 0, buf, ret); - } + if (fd == s->cmd_err) { + ret = read(fd, buf, sizeof(buf)); + if (ret > 0) + log_proxy_stderr(s->plug, &s->pending_error_data, buf, ret); + } else { + assert(fd == s->from_cmd); + ret = read(fd, buf, sizeof(buf)); + if (ret < 0) { + return plug_closing(s->plug, strerror(errno), errno, 0); + } else if (ret == 0) { + return plug_closing(s->plug, NULL, 0, 0); + } else { + return plug_receive(s->plug, 0, buf, ret); + } + } } else if (event == 2) { assert(fd == s->to_cmd); if (localproxy_try_send(s)) @@ -250,13 +288,12 @@ }; Local_Proxy_Socket ret; - int to_cmd_pipe[2], from_cmd_pipe[2], pid; + int to_cmd_pipe[2], from_cmd_pipe[2], cmd_err_pipe[2], pid, proxytype; - if (conf_get_int(conf, CONF_proxy_type) != PROXY_CMD) + proxytype = conf_get_int(conf, CONF_proxy_type); + if (proxytype != PROXY_CMD && proxytype != PROXY_FUZZ) return NULL; - cmd = format_telnet_command(addr, port, conf); - ret = snew(struct Socket_localproxy_tag); ret->fn = &socket_fn_table; ret->plug = plug; @@ -265,56 +302,111 @@ bufchain_init(&ret->pending_input_data); bufchain_init(&ret->pending_output_data); + bufchain_init(&ret->pending_error_data); - /* - * Create the pipes to the proxy command, and spawn the proxy - * command process. - */ - if (pipe(to_cmd_pipe) < 0 || - pipe(from_cmd_pipe) < 0) { - ret->error = dupprintf("pipe: %s", strerror(errno)); - sfree(cmd); - return (Socket)ret; - } - cloexec(to_cmd_pipe[1]); - cloexec(from_cmd_pipe[0]); + if (proxytype == PROXY_CMD) { + cmd = format_telnet_command(addr, port, conf); - pid = fork(); + if (flags & FLAG_STDERR) { + /* If we have a sensible stderr, the proxy command can + * send its own standard error there, so we won't + * interfere. */ + cmd_err_pipe[0] = cmd_err_pipe[1] = -1; + } else { + /* If we don't have a sensible stderr, we should catch the + * proxy command's standard error to put in our event + * log. */ + cmd_err_pipe[0] = cmd_err_pipe[1] = 0; + } + + { + char *logmsg = dupprintf("Starting local proxy command: %s", cmd); + plug_log(plug, 2, NULL, 0, logmsg, 0); + sfree(logmsg); + } + + /* + * Create the pipes to the proxy command, and spawn the proxy + * command process. + */ + if (pipe(to_cmd_pipe) < 0 || + pipe(from_cmd_pipe) < 0 || + (cmd_err_pipe[0] == 0 && pipe(cmd_err_pipe) < 0)) { + ret->error = dupprintf("pipe: %s", strerror(errno)); + sfree(cmd); + return (Socket)ret; + } + cloexec(to_cmd_pipe[1]); + cloexec(from_cmd_pipe[0]); + if (cmd_err_pipe[0] >= 0) + cloexec(cmd_err_pipe[0]); + + pid = fork(); + + if (pid < 0) { + ret->error = dupprintf("fork: %s", strerror(errno)); + sfree(cmd); + return (Socket)ret; + } else if (pid == 0) { + close(0); + close(1); + dup2(to_cmd_pipe[0], 0); + dup2(from_cmd_pipe[1], 1); + close(to_cmd_pipe[0]); + close(from_cmd_pipe[1]); + if (cmd_err_pipe[0] >= 0) { + dup2(cmd_err_pipe[1], 2); + close(cmd_err_pipe[1]); + } + noncloexec(0); + noncloexec(1); + execl("/bin/sh", "sh", "-c", cmd, (void *)NULL); + _exit(255); + } + + sfree(cmd); - if (pid < 0) { - ret->error = dupprintf("fork: %s", strerror(errno)); - sfree(cmd); - return (Socket)ret; - } else if (pid == 0) { - close(0); - close(1); - dup2(to_cmd_pipe[0], 0); - dup2(from_cmd_pipe[1], 1); close(to_cmd_pipe[0]); close(from_cmd_pipe[1]); - noncloexec(0); - noncloexec(1); - execl("/bin/sh", "sh", "-c", cmd, (void *)NULL); - _exit(255); - } - - sfree(cmd); - - close(to_cmd_pipe[0]); - close(from_cmd_pipe[1]); + if (cmd_err_pipe[0] >= 0) + close(cmd_err_pipe[1]); - ret->to_cmd = to_cmd_pipe[1]; - ret->from_cmd = from_cmd_pipe[0]; + ret->to_cmd = to_cmd_pipe[1]; + ret->from_cmd = from_cmd_pipe[0]; + ret->cmd_err = cmd_err_pipe[0]; + } else { + cmd = format_telnet_command(addr, port, conf); + ret->to_cmd = open("/dev/null", O_WRONLY); + if (ret->to_cmd == -1) { + ret->error = dupprintf("/dev/null: %s", strerror(errno)); + sfree(cmd); + return (Socket)ret; + } + ret->from_cmd = open(cmd, O_RDONLY); + if (ret->from_cmd == -1) { + ret->error = dupprintf("%s: %s", cmd, strerror(errno)); + sfree(cmd); + return (Socket)ret; + } + sfree(cmd); + ret->cmd_err = -1; + } if (!localproxy_by_fromfd) localproxy_by_fromfd = newtree234(localproxy_fromfd_cmp); if (!localproxy_by_tofd) localproxy_by_tofd = newtree234(localproxy_tofd_cmp); + if (!localproxy_by_errfd) + localproxy_by_errfd = newtree234(localproxy_errfd_cmp); add234(localproxy_by_fromfd, ret); add234(localproxy_by_tofd, ret); + if (ret->cmd_err >= 0) + add234(localproxy_by_errfd, ret); uxsel_set(ret->from_cmd, 1, localproxy_select_result); + if (ret->cmd_err >= 0) + uxsel_set(ret->cmd_err, 1, localproxy_select_result); /* We are responsible for this and don't need it any more */ sk_addr_free(addr); diff -Nru filezilla-3.14.1/src/putty/unix/uxsel.c filezilla-3.15.0.2/src/putty/unix/uxsel.c --- filezilla-3.14.1/src/putty/unix/uxsel.c 2015-08-22 09:28:47.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/unix/uxsel.c 2016-02-05 08:54:46.000000000 +0000 @@ -64,6 +64,8 @@ { struct fd *newfd; + assert(fd >= 0); + uxsel_del(fd); if (rwx) { diff -Nru filezilla-3.14.1/src/putty/unix/uxshare.c filezilla-3.15.0.2/src/putty/unix/uxshare.c --- filezilla-3.14.1/src/putty/unix/uxshare.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/unix/uxshare.c 2016-02-05 08:54:46.000000000 +0000 @@ -23,6 +23,9 @@ #define CONNSHARE_SOCKETDIR_PREFIX "/tmp/putty-connshare" #define SALT_FILENAME "salt" #define SALT_SIZE 64 +#ifndef PIPE_BUF +#define PIPE_BUF _POSIX_PIPE_BUF +#endif /* * Functions provided by uxnet.c to help connection sharing. diff -Nru filezilla-3.14.1/src/putty/windows/Makefile.am filezilla-3.15.0.2/src/putty/windows/Makefile.am --- filezilla-3.14.1/src/putty/windows/Makefile.am 2015-05-12 13:35:39.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/Makefile.am 2016-02-05 08:54:46.000000000 +0000 @@ -16,6 +16,7 @@ libfzsftp_win_a_CFLAGS = $(COMMON_CFLAGS) libfzsftp_win_a_SOURCES = \ + wincapi.c \ windefs.c \ winhandl.c \ winhsock.c \ @@ -28,7 +29,7 @@ winshare.c \ wintime.c -noinst_HEADERS = winsecur.h winstuff.h rcstuff.h +noinst_HEADERS = wincapi.h winsecur.h winstuff.h rcstuff.h dist_noinst_DATA = psftp.rc version.rc2 pscp.ico windows_manifest.xml diff -Nru filezilla-3.14.1/src/putty/windows/Makefile.in filezilla-3.15.0.2/src/putty/windows/Makefile.in --- filezilla-3.14.1/src/putty/windows/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/Makefile.in 2016-02-10 19:38:52.000000000 +0000 @@ -123,7 +123,8 @@ libfzputtycommon_win_a_OBJECTS = $(am_libfzputtycommon_win_a_OBJECTS) libfzsftp_win_a_AR = $(AR) $(ARFLAGS) libfzsftp_win_a_LIBADD = -am_libfzsftp_win_a_OBJECTS = libfzsftp_win_a-windefs.$(OBJEXT) \ +am_libfzsftp_win_a_OBJECTS = libfzsftp_win_a-wincapi.$(OBJEXT) \ + libfzsftp_win_a-windefs.$(OBJEXT) \ libfzsftp_win_a-winhandl.$(OBJEXT) \ libfzsftp_win_a-winhsock.$(OBJEXT) \ libfzsftp_win_a-winnet.$(OBJEXT) \ @@ -251,6 +252,8 @@ 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@ @@ -384,6 +387,7 @@ libfzsftp_win_a_CFLAGS = $(COMMON_CFLAGS) libfzsftp_win_a_SOURCES = \ + wincapi.c \ windefs.c \ winhandl.c \ winhsock.c \ @@ -396,7 +400,7 @@ winshare.c \ wintime.c -noinst_HEADERS = winsecur.h winstuff.h rcstuff.h +noinst_HEADERS = wincapi.h winsecur.h winstuff.h rcstuff.h dist_noinst_DATA = psftp.rc version.rc2 pscp.ico windows_manifest.xml CLEANFILES = pscp.o @USE_RESOURCEFILE_TRUE@nodist_noinst_DATA = psftp.o @@ -458,6 +462,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzputtycommon_win_a-winmisc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzputtycommon_win_a-winnoise.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzputtycommon_win_a-winstore.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzsftp_win_a-wincapi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzsftp_win_a-windefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzsftp_win_a-winhandl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfzsftp_win_a-winhsock.Po@am__quote@ @@ -547,6 +552,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzputtycommon_win_a_CFLAGS) $(CFLAGS) -c -o libfzputtycommon_win_a-winstore.obj `if test -f 'winstore.c'; then $(CYGPATH_W) 'winstore.c'; else $(CYGPATH_W) '$(srcdir)/winstore.c'; fi` +libfzsftp_win_a-wincapi.o: wincapi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzsftp_win_a_CFLAGS) $(CFLAGS) -MT libfzsftp_win_a-wincapi.o -MD -MP -MF $(DEPDIR)/libfzsftp_win_a-wincapi.Tpo -c -o libfzsftp_win_a-wincapi.o `test -f 'wincapi.c' || echo '$(srcdir)/'`wincapi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfzsftp_win_a-wincapi.Tpo $(DEPDIR)/libfzsftp_win_a-wincapi.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wincapi.c' object='libfzsftp_win_a-wincapi.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzsftp_win_a_CFLAGS) $(CFLAGS) -c -o libfzsftp_win_a-wincapi.o `test -f 'wincapi.c' || echo '$(srcdir)/'`wincapi.c + +libfzsftp_win_a-wincapi.obj: wincapi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzsftp_win_a_CFLAGS) $(CFLAGS) -MT libfzsftp_win_a-wincapi.obj -MD -MP -MF $(DEPDIR)/libfzsftp_win_a-wincapi.Tpo -c -o libfzsftp_win_a-wincapi.obj `if test -f 'wincapi.c'; then $(CYGPATH_W) 'wincapi.c'; else $(CYGPATH_W) '$(srcdir)/wincapi.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfzsftp_win_a-wincapi.Tpo $(DEPDIR)/libfzsftp_win_a-wincapi.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wincapi.c' object='libfzsftp_win_a-wincapi.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzsftp_win_a_CFLAGS) $(CFLAGS) -c -o libfzsftp_win_a-wincapi.obj `if test -f 'wincapi.c'; then $(CYGPATH_W) 'wincapi.c'; else $(CYGPATH_W) '$(srcdir)/wincapi.c'; fi` + libfzsftp_win_a-windefs.o: windefs.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfzsftp_win_a_CFLAGS) $(CFLAGS) -MT libfzsftp_win_a-windefs.o -MD -MP -MF $(DEPDIR)/libfzsftp_win_a-windefs.Tpo -c -o libfzsftp_win_a-windefs.o `test -f 'windefs.c' || echo '$(srcdir)/'`windefs.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfzsftp_win_a-windefs.Tpo $(DEPDIR)/libfzsftp_win_a-windefs.Po diff -Nru filezilla-3.14.1/src/putty/windows/version.rc2 filezilla-3.15.0.2/src/putty/windows/version.rc2 --- filezilla-3.14.1/src/putty/windows/version.rc2 2015-01-03 11:35:56.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/version.rc2 2016-02-05 08:54:46.000000000 +0000 @@ -102,7 +102,7 @@ VALUE "OriginalFilename", APPNAME VALUE "FileVersion", VERSION_TEXT VALUE "ProductVersion", VERSION_TEXT - VALUE "LegalCopyright", "Copyright \251 2004-2015 Tim Kosse, 1997-2015 Simon Tatham." + VALUE "LegalCopyright", "Copyright \251 2004-2016 Tim Kosse, 1997-2016 Simon Tatham." #if (!defined SNAPSHOT) && (!defined RELEASE) /* Only if VS_FF_PRIVATEBUILD. */ VALUE "PrivateBuild", VERSION_TEXT /* NBI */ diff -Nru filezilla-3.14.1/src/putty/windows/wincapi.c filezilla-3.15.0.2/src/putty/windows/wincapi.c --- filezilla-3.14.1/src/putty/windows/wincapi.c 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/wincapi.c 2016-02-05 08:54:46.000000000 +0000 @@ -0,0 +1,27 @@ +/* + * wincapi.c: implementation of wincapi.h. + */ + +#include "putty.h" + +#if !defined NO_SECURITY + +#define WINCAPI_GLOBAL +#include "wincapi.h" + +int got_crypt(void) +{ + static int attempted = FALSE; + static int successful; + static HMODULE crypt; + + if (!attempted) { + attempted = TRUE; + crypt = load_system32_dll("crypt32.dll"); + successful = crypt && + GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory); + } + return successful; +} + +#endif /* !defined NO_SECURITY */ diff -Nru filezilla-3.14.1/src/putty/windows/wincapi.h filezilla-3.15.0.2/src/putty/windows/wincapi.h --- filezilla-3.14.1/src/putty/windows/wincapi.h 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/wincapi.h 2016-02-05 08:54:46.000000000 +0000 @@ -0,0 +1,18 @@ +/* + * wincapi.h: Windows Crypto API functions defined in wincrypt.c + * that use the crypt32 library. Also centralises the machinery + * for dynamically loading that library. + */ + +#if !defined NO_SECURITY + +#ifndef WINCAPI_GLOBAL +#define WINCAPI_GLOBAL extern +#endif + +DECL_WINDOWS_FUNCTION(WINCAPI_GLOBAL, BOOL, CryptProtectMemory, + (LPVOID,DWORD,DWORD)); + +int got_crypt(void); + +#endif diff -Nru filezilla-3.14.1/src/putty/windows/winhsock.c filezilla-3.15.0.2/src/putty/windows/winhsock.c --- filezilla-3.14.1/src/putty/windows/winhsock.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winhsock.c 2016-02-05 08:54:46.000000000 +0000 @@ -18,8 +18,8 @@ const struct socket_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ - HANDLE send_H, recv_H; - struct handle *send_h, *recv_h; + HANDLE send_H, recv_H, stderr_H; + struct handle *send_h, *recv_h, *stderr_h; /* * Freezing one of these sockets is a slightly fiddly business, @@ -39,6 +39,9 @@ /* We buffer data here if we receive it from winhandl while frozen. */ bufchain inputdata; + /* Data received from stderr_H, if we have one. */ + bufchain stderrdata; + char *error; Plug plug; @@ -75,6 +78,16 @@ } } +static int handle_stderr(struct handle *h, void *data, int len) +{ + Handle_Socket ps = (Handle_Socket) handle_get_privdata(h); + + if (len > 0) + log_proxy_stderr(ps->plug, &ps->stderrdata, data, len); + + return 0; +} + static void handle_sentdata(struct handle *h, int new_backlog) { Handle_Socket ps = (Handle_Socket) handle_get_privdata(h); @@ -101,6 +114,7 @@ if (ps->recv_H != ps->send_H) CloseHandle(ps->recv_H); bufchain_clear(&ps->inputdata); + bufchain_clear(&ps->stderrdata); sfree(ps); } @@ -259,8 +273,8 @@ return NULL; } -Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, Plug plug, - int overlapped) +Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, HANDLE stderr_H, + Plug plug, int overlapped) { static const struct socket_function_table socket_fn_table = { sk_handle_plug, @@ -283,11 +297,16 @@ ret->error = NULL; ret->frozen = UNFROZEN; bufchain_init(&ret->inputdata); + bufchain_init(&ret->stderrdata); ret->recv_H = recv_H; ret->recv_h = handle_input_new(ret->recv_H, handle_gotdata, ret, flags); ret->send_H = send_H; ret->send_h = handle_output_new(ret->send_H, handle_sentdata, ret, flags); + ret->stderr_H = stderr_H; + if (ret->stderr_H) + ret->stderr_h = handle_input_new(ret->stderr_H, handle_stderr, + ret, flags); return (Socket) ret; } diff -Nru filezilla-3.14.1/src/putty/windows/winmisc.c filezilla-3.15.0.2/src/putty/windows/winmisc.c --- filezilla-3.14.1/src/putty/windows/winmisc.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winmisc.c 2016-02-05 08:54:46.000000000 +0000 @@ -9,6 +9,7 @@ #define SECURITY_WIN32 #endif #include +#include OSVERSIONINFO osVersion; @@ -538,3 +539,76 @@ GET_32BIT_MSB_FIRST(end + 4), GET_32BIT_MSB_FIRST(end + 8)); } + + +FILE *f_open(const struct Filename *filename, char const *mode, int is_private) +{ + FILE* f; + wchar_t *wname, *wmode; + + (void)is_private; + + if (!filename || !filename->path || !mode) { + return NULL; + } + + // The filename is in UTF-8, not expressible in system char, need to use wchar_t. Thus we need to use CreateFileW and convert the HANDLE to a FILE* + wname = utf8_to_wide(filename->path); + wmode = utf8_to_wide(mode); + if (!wname || !wmode) { + sfree(wname); + sfree(wmode); + return NULL; + } + + f = _wfopen(wname, wmode); + + sfree(wname); + sfree(wmode); + + return f; +} + +wchar_t* utf8_to_wide(const char* utf8) +{ + wchar_t *w; + + int len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, 0, 0); + if (len <= 0) + return NULL; + + w = snewn(len, wchar_t); + + if (!w) + return NULL; + + if (MultiByteToWideChar(CP_UTF8, 0, utf8, -1, w, len) <= 0) + { + sfree(w); + return NULL; + } + + return w; +} + +char* wide_to_utf8(const wchar_t* w) +{ + char* utf8; + + int len = WideCharToMultiByte(CP_UTF8, 0, w, -1, 0, 0, 0, 0); + if (len <= 0) + return NULL; + + utf8 = snewn(len, char); + + if (!utf8) + return NULL; + + if (WideCharToMultiByte(CP_UTF8, 0, w, -1, utf8, len, 0, 0) <= 0) + { + sfree(utf8); + return NULL; + } + + return utf8; +} diff -Nru filezilla-3.14.1/src/putty/windows/winnpc.c filezilla-3.15.0.2/src/putty/windows/winnpc.c --- filezilla-3.14.1/src/putty/windows/winnpc.c 2014-12-18 15:15:44.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winnpc.c 2016-02-05 08:54:46.000000000 +0000 @@ -16,8 +16,8 @@ #include "winsecur.h" -Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, Plug plug, - int overlapped); +Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, HANDLE stderr_H, + Plug plug, int overlapped); Socket new_named_pipe_client(const char *pipename, Plug plug) { @@ -96,7 +96,7 @@ LocalFree(psd); sfree(usersid); - return make_handle_socket(pipehandle, pipehandle, plug, TRUE); + return make_handle_socket(pipehandle, pipehandle, NULL, plug, TRUE); } #endif /* !defined NO_SECURITY */ diff -Nru filezilla-3.14.1/src/putty/windows/winnps.c filezilla-3.15.0.2/src/putty/windows/winnps.c --- filezilla-3.14.1/src/putty/windows/winnps.c 2015-08-10 13:23:23.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winnps.c 2016-02-05 08:54:46.000000000 +0000 @@ -16,8 +16,8 @@ #include "winsecur.h" -Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, Plug plug, - int overlapped); +Socket make_handle_socket(HANDLE send_H, HANDLE recv_H, HANDLE stderr_H, + Plug plug, int overlapped); typedef struct Socket_named_pipe_server_tag *Named_Pipe_Server_Socket; struct Socket_named_pipe_server_tag { @@ -120,7 +120,7 @@ { HANDLE conn = (HANDLE)ctx.p; - return make_handle_socket(conn, conn, plug, TRUE); + return make_handle_socket(conn, conn, NULL, plug, TRUE); } /* diff -Nru filezilla-3.14.1/src/putty/windows/winsecur.c filezilla-3.15.0.2/src/putty/windows/winsecur.c --- filezilla-3.14.1/src/putty/windows/winsecur.c 2014-12-18 15:15:44.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winsecur.c 2016-02-05 08:54:46.000000000 +0000 @@ -12,6 +12,10 @@ #define WINSECUR_GLOBAL #include "winsecur.h" +/* Initialised once, then kept around to reuse forever */ +static PSID worldsid, networksid, usersid; + + int got_advapi(void) { static int attempted = FALSE; @@ -23,6 +27,7 @@ advapi = load_system32_dll("advapi32.dll"); successful = advapi && GET_WINDOWS_FUNCTION(advapi, GetSecurityInfo) && + GET_WINDOWS_FUNCTION(advapi, SetSecurityInfo) && GET_WINDOWS_FUNCTION(advapi, OpenProcessToken) && GET_WINDOWS_FUNCTION(advapi, GetTokenInformation) && GET_WINDOWS_FUNCTION(advapi, InitializeSecurityDescriptor) && @@ -32,21 +37,6 @@ return successful; } -int got_crypt(void) -{ - static int attempted = FALSE; - static int successful; - static HMODULE crypt; - - if (!attempted) { - attempted = TRUE; - crypt = load_system32_dll("crypt32.dll"); - successful = crypt && - GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory); - } - return successful; -} - PSID get_user_sid(void) { HANDLE proc = NULL, tok = NULL; @@ -99,32 +89,17 @@ return ret; } -int make_private_security_descriptor(DWORD permissions, - PSECURITY_DESCRIPTOR *psd, - PACL *acl, - char **error) +int getsids(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; + int ret; - /* Initialised once, then kept around to reuse forever */ - static PSID worldsid, networksid, usersid; - - *psd = NULL; - *acl = NULL; - *error = NULL; - - if (!got_advapi()) { - *error = dupprintf("unable to load advapi32.dll"); - goto cleanup; - } + 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; } @@ -133,7 +108,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; } @@ -142,13 +117,43 @@ 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; + + cleanup: + if (ret) { + sfree(error); + error = NULL; + } + return ret; +} + + +int make_private_security_descriptor(DWORD permissions, + PSECURITY_DESCRIPTOR *psd, + 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; + + + *psd = NULL; + *acl = NULL; + *error = NULL; + + if (!getsids(*error)) + goto cleanup; + memset(ea, 0, sizeof(ea)); ea[0].grfAccessPermissions = permissions; ea[0].grfAccessMode = REVOKE_ACCESS; @@ -218,4 +223,68 @@ return ret; } +int setprocessacl(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 | + PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | + PROCESS_DUP_HANDLE | PROCESS_QUERY_INFORMATION | + PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | + PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE | + PROCESS_SUSPEND_RESUME; + + if (!getsids(error)) + goto cleanup; + + memset(ea, 0, sizeof(ea)); + + /* Everyone: deny */ + ea[0].grfAccessPermissions = nastyace; + ea[0].grfAccessMode = DENY_ACCESS; + ea[0].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; + ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID; + ea[0].Trustee.ptstrName = (LPTSTR)worldsid; + + /* User: user ace */ + ea[1].grfAccessPermissions = ~nastyace & 0x1fff; + ea[1].grfAccessMode = GRANT_ACCESS; + ea[1].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; + ea[1].Trustee.TrusteeForm = TRUSTEE_IS_SID; + ea[1].Trustee.ptstrName = (LPTSTR)usersid; + + 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)); + goto cleanup; + } + + if (ERROR_SUCCESS != p_SetSecurityInfo + (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())); + goto cleanup; + } + + + ret=TRUE; + + cleanup: + if (!ret) { + if (acl) { + LocalFree(acl); + acl = NULL; + } + } + return ret; +} #endif /* !defined NO_SECURITY */ diff -Nru filezilla-3.14.1/src/putty/windows/winsecur.h filezilla-3.15.0.2/src/putty/windows/winsecur.h --- filezilla-3.14.1/src/putty/windows/winsecur.h 2014-12-18 15:15:44.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winsecur.h 2016-02-05 08:54:46.000000000 +0000 @@ -28,18 +28,14 @@ (HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, PSECURITY_DESCRIPTOR *)); +DECL_WINDOWS_FUNCTION(WINSECUR_GLOBAL, DWORD, SetSecurityInfo, + (HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL)); DECL_WINDOWS_FUNCTION(WINSECUR_GLOBAL, DWORD, SetEntriesInAclA, (ULONG, PEXPLICIT_ACCESS, PACL, PACL *)); int got_advapi(void); /* - * Functions loaded from crypt32.dll. - */ -DECL_WINDOWS_FUNCTION(WINSECUR_GLOBAL, BOOL, CryptProtectMemory, - (LPVOID, DWORD, DWORD)); -int got_crypt(void); - -/* * Find the SID describing the current user. The return value (if not * NULL for some error-related reason) is smalloced. */ @@ -60,4 +56,6 @@ PACL *acl, char **error); +int setprocessacl(char *error); + #endif diff -Nru filezilla-3.14.1/src/putty/windows/winsftp.c filezilla-3.15.0.2/src/putty/windows/winsftp.c --- filezilla-3.14.1/src/putty/windows/winsftp.c 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winsftp.c 2016-02-05 08:54:46.000000000 +0000 @@ -30,50 +30,6 @@ * File access abstraction. */ -static wchar_t* utf8_to_wide(const char* utf8) -{ - wchar_t *w; - - int len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, 0, 0); - if (len <= 0) - return NULL; - - w = snewn(len, wchar_t); - - if (!w) - return NULL; - - if (MultiByteToWideChar(CP_UTF8, 0, utf8, -1, w, len) <= 0) - { - sfree(w); - return NULL; - } - - return w; -} - -static char* wide_to_utf8(const wchar_t* w) -{ - char* utf8; - - int len = WideCharToMultiByte(CP_UTF8, 0, w, -1, 0, 0, 0, 0); - if (len <= 0) - return NULL; - - utf8 = snewn(len, char); - - if (!utf8) - return NULL; - - if (WideCharToMultiByte(CP_UTF8, 0, w, -1, utf8, len, 0, 0) <= 0) - { - sfree(utf8); - return NULL; - } - - return utf8; -} - /* * Set local current directory. Returns NULL on success, or else an * error message which must be freed after printing. diff -Nru filezilla-3.14.1/src/putty/windows/winshare.c filezilla-3.15.0.2/src/putty/windows/winshare.c --- filezilla-3.14.1/src/putty/windows/winshare.c 2014-12-18 15:15:44.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winshare.c 2016-02-05 08:54:46.000000000 +0000 @@ -14,6 +14,7 @@ #include "proxy.h" #include "ssh.h" +#include "wincapi.h" #include "winsecur.h" #ifdef COVERITY diff -Nru filezilla-3.14.1/src/putty/windows/winstuff.h filezilla-3.15.0.2/src/putty/windows/winstuff.h --- filezilla-3.14.1/src/putty/windows/winstuff.h 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/windows/winstuff.h 2016-02-05 08:54:46.000000000 +0000 @@ -30,7 +30,10 @@ struct Filename { char *path; }; -#define f_open(filename, mode, isprivate) ( fopen((filename)->path, (mode)) ) +FILE *f_open(const struct Filename *filename, char const *mode, int is_private); + +wchar_t* utf8_to_wide(const char* utf8); +char* wide_to_utf8(const wchar_t* w); struct FontSpec { char *name; diff -Nru filezilla-3.14.1/src/putty/x11fwd.c filezilla-3.15.0.2/src/putty/x11fwd.c --- filezilla-3.14.1/src/putty/x11fwd.c 2015-09-10 09:37:18.000000000 +0000 +++ filezilla-3.15.0.2/src/putty/x11fwd.c 2016-02-05 08:54:46.000000000 +0000 @@ -286,7 +286,8 @@ disp->port = 6000 + disp->displaynum; disp->addr = name_lookup(disp->hostname, disp->port, - &disp->realhost, conf, ADDRTYPE_UNSPEC); + &disp->realhost, conf, ADDRTYPE_UNSPEC, + NULL, NULL); if ((err = sk_addr_error(disp->addr)) != NULL) { sk_addr_free(disp->addr); diff -Nru filezilla-3.14.1/tests/cmpnatural.cpp filezilla-3.15.0.2/tests/cmpnatural.cpp --- filezilla-3.14.1/tests/cmpnatural.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/cmpnatural.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff -Nru filezilla-3.14.1/tests/dirparsertest.cpp filezilla-3.15.0.2/tests/dirparsertest.cpp --- filezilla-3.14.1/tests/dirparsertest.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/dirparsertest.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -50,8 +50,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(CDirectoryListingParserTest); -typedef CRefcountObject R; -typedef CSparseOptional O; +typedef CRefcountObject R; +typedef CSparseOptional O; static int calcYear(int month, int day) { @@ -83,7 +83,7 @@ R(_T("root other")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 1994, 4, 8) + fz::datetime(fz::datetime::utc, 1994, 4, 8) }, DEFAULT }); @@ -98,7 +98,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, calcYear(3, 29), 3, 29, 3, 26) + fz::datetime(fz::datetime::utc, calcYear(3, 29), 3, 29, 3, 26) }, DEFAULT }); @@ -113,7 +113,7 @@ R(_T("root")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 1994, 4, 8) + fz::datetime(fz::datetime::utc, 1994, 4, 8) }, DEFAULT }); @@ -128,7 +128,7 @@ R(_T("root other")), CDirentry::flag_dir | CDirentry::flag_link, O(_T("usr/bin")), - CDateTime(CDateTime::utc, calcYear(1, 25), 1, 25, 0, 17) + fz::datetime(fz::datetime::utc, calcYear(1, 25), 1, 25, 0, 17) }, DEFAULT }); @@ -145,7 +145,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, 2000, 9, 26) + fz::datetime(fz::datetime::utc, 2000, 9, 26) }, DEFAULT }); @@ -159,7 +159,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, calcYear(9, 26), 9, 26, 13, 45) + fz::datetime(fz::datetime::utc, calcYear(9, 26), 9, 26, 13, 45) }, DEFAULT }); @@ -173,7 +173,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, 2005, 6, 7, 21, 22) + fz::datetime(fz::datetime::utc, 2005, 6, 7, 21, 22) }, DEFAULT }); @@ -189,7 +189,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, calcYear(10, 5), 10, 5, 21, 22) + fz::datetime(fz::datetime::utc, calcYear(10, 5), 10, 5, 21, 22) }, DEFAULT }); @@ -206,7 +206,7 @@ R(_T("supervisor")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, calcYear(1, 16), 1, 16, 18, 53) + fz::datetime(fz::datetime::utc, calcYear(1, 16), 1, 16, 18, 53) }, DEFAULT }); @@ -220,7 +220,7 @@ R(_T("rhesus")), 0, O(), - CDateTime(CDateTime::utc, calcYear(10, 20), 10, 20, 15, 27) + fz::datetime(fz::datetime::utc, calcYear(10, 20), 10, 20, 15, 27) }, DEFAULT }); @@ -241,7 +241,7 @@ R(_T("1391972")), 0, O(), - CDateTime(CDateTime::utc, 1995, 11, 22) + fz::datetime(fz::datetime::utc, 1995, 11, 22) }, DEFAULT }); @@ -255,7 +255,7 @@ R(_T("folder")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 1996, 5, 10) + fz::datetime(fz::datetime::utc, 1996, 5, 10) }, DEFAULT }); @@ -270,7 +270,7 @@ R(_T("group domain user")), 0, O(), - CDateTime(CDateTime::utc, calcYear(1, 29), 1, 29, 3, 26) + fz::datetime(fz::datetime::utc, calcYear(1, 29), 1, 29, 3, 26) }, DEFAULT }); @@ -289,7 +289,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 1996, 3, 1, 22, 15, 3) + fz::datetime(fz::datetime::utc, 1996, 3, 1, 22, 15, 3) }, DEFAULT }); @@ -303,7 +303,7 @@ R(), CDirentry::flag_dir | 0, O(), - CDateTime(CDateTime::utc, 1996, 2, 13, 23, 58, 27) + fz::datetime(fz::datetime::utc, 1996, 2, 13, 23, 58, 27) }, DEFAULT }); @@ -320,7 +320,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2000, 4, 27, 12, 9) + fz::datetime(fz::datetime::utc, 2000, 4, 27, 12, 9) }, DEFAULT }); @@ -335,7 +335,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2000, 4, 6, 15, 47) + fz::datetime(fz::datetime::utc, 2000, 4, 6, 15, 47) }, DEFAULT }); @@ -349,7 +349,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2002, 9, 2, 18, 48) + fz::datetime(fz::datetime::utc, 2002, 9, 2, 18, 48) }, DEFAULT }); @@ -363,7 +363,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2002, 9, 2, 19, 6) + fz::datetime(fz::datetime::utc, 2002, 9, 2, 19, 6) }, DEFAULT }); @@ -378,7 +378,7 @@ R(_T("500 101")), 0, O(), - CDateTime(CDateTime::utc, 1973, 11, 29, 21, 33, 9) + fz::datetime(fz::datetime::utc, 1973, 11, 29, 21, 33, 9) }, DEFAULT }); @@ -395,7 +395,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2000, 4, 4, 21, 6) + fz::datetime(fz::datetime::utc, 2000, 4, 4, 21, 6) }, DEFAULT }); @@ -409,7 +409,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2002, 12, 12, 2, 13) + fz::datetime(fz::datetime::utc, 2002, 12, 12, 2, 13) }, DEFAULT }); @@ -425,7 +425,7 @@ R(_T("user group")), 0, O(), - CDateTime(CDateTime::utc, 2002, 10, 8, 9, 47) + fz::datetime(fz::datetime::utc, 2002, 10, 8, 9, 47) }, DEFAULT }); @@ -443,7 +443,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2003, 4, 23, 10, 57) + fz::datetime(fz::datetime::utc, 2003, 4, 23, 10, 57) }, DEFAULT }); @@ -457,7 +457,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 1999, 7, 14, 12, 37) + fz::datetime(fz::datetime::utc, 1999, 7, 14, 12, 37) }, DEFAULT }); @@ -472,7 +472,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2003, 2, 11, 16, 15) + fz::datetime(fz::datetime::utc, 2003, 2, 11, 16, 15) }, DEFAULT }); @@ -487,7 +487,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2000, 10, 5, 23, 38) + fz::datetime(fz::datetime::utc, 2000, 10, 5, 23, 38) }, DEFAULT }); @@ -504,7 +504,7 @@ R(_T("root other")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, calcYear(7, 26), 7, 26, 20, 10) + fz::datetime(fz::datetime::utc, calcYear(7, 26), 7, 26, 20, 10) }, DEFAULT }); @@ -518,7 +518,7 @@ R(_T("root other")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, calcYear(9, 26), 9, 26, 20, 10) + fz::datetime(fz::datetime::utc, calcYear(9, 26), 9, 26, 20, 10) }, DEFAULT }); @@ -532,7 +532,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, 2003, 10, 2) + fz::datetime(fz::datetime::utc, 2003, 10, 2) }, DEFAULT }); @@ -546,7 +546,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, 1999, 10, 12, 17, 12) + fz::datetime(fz::datetime::utc, 1999, 10, 12, 17, 12) }, DEFAULT }); @@ -560,7 +560,7 @@ R(_T("root other")), 0, O(), - CDateTime(CDateTime::utc, 2003, 4, 24, 17, 12) + fz::datetime(fz::datetime::utc, 2003, 4, 24, 17, 12) }, DEFAULT }); @@ -577,7 +577,7 @@ R(_T("root sys")), 0, O(), - CDateTime(CDateTime::utc, 2003, 4, 18) + fz::datetime(fz::datetime::utc, 2003, 4, 18) }, DEFAULT }); @@ -593,7 +593,7 @@ R(_T("root staff")), 0, O(), - CDateTime(CDateTime::utc, 2003, 3, 20) + fz::datetime(fz::datetime::utc, 2003, 3, 20) }, DEFAULT }); @@ -607,7 +607,7 @@ R(_T("root root")), 0, O(), - CDateTime(CDateTime::utc, calcYear(8, 17), 8, 17, 8, 52) + fz::datetime(fz::datetime::utc, calcYear(8, 17), 8, 17, 8, 52) }, DEFAULT }); @@ -621,7 +621,7 @@ R(_T("root root")), 0, O(), - CDateTime(CDateTime::utc, 2004, 7, 15) + fz::datetime(fz::datetime::utc, 2004, 7, 15) }, DEFAULT }); @@ -638,7 +638,7 @@ R(_T("root,root")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2001, 11, 19, 21, 41) + fz::datetime(fz::datetime::utc, 2001, 11, 19, 21, 41) }, DEFAULT }); @@ -653,7 +653,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2003, 7, 2, 10, 30, 13) + fz::datetime(fz::datetime::utc, 2003, 7, 2, 10, 30, 13) }, DEFAULT }); @@ -668,7 +668,7 @@ R(_T("IV2_XXX")), 0, O(), - CDateTime(CDateTime::utc, 2000, 1, 7) + fz::datetime(fz::datetime::utc, 2000, 1, 7) }, DEFAULT }); @@ -683,7 +683,7 @@ R(_T("PRONAS")), 0, O(), - CDateTime(CDateTime::utc, 2002, 7, 15) + fz::datetime(fz::datetime::utc, 2002, 7, 15) }, DEFAULT }); @@ -697,7 +697,7 @@ R(_T("FTP_CLIENT,SCOT")), 0, O(), - CDateTime(CDateTime::utc, 2003, 4, 24, 8, 16, 15) + fz::datetime(fz::datetime::utc, 2003, 4, 24, 8, 16, 15) }, DEFAULT }); @@ -711,7 +711,7 @@ R(_T("FTP_CLIENT,SCOT")), 0, O(), - CDateTime(CDateTime::utc, 2003, 7, 2, 10, 30, 8) + fz::datetime(fz::datetime::utc, 2003, 7, 2, 10, 30, 8) }, DEFAULT }); @@ -726,7 +726,7 @@ R(_T("SUMMARY")), 0, O(), - CDateTime(CDateTime::utc, 2006, 8, 2, 13, 5) + fz::datetime(fz::datetime::utc, 2006, 8, 2, 13, 5) }, DEFAULT }); @@ -740,7 +740,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 1994, 6, 17, 17, 25, 37) + fz::datetime(fz::datetime::utc, 1994, 6, 17, 17, 25, 37) }, DEFAULT }); @@ -758,7 +758,7 @@ R(_T("QSYS")), CDirentry::flag_dir | 0, O(), - CDateTime(CDateTime::utc, 2000, 2, 23, 15, 9, 55) + fz::datetime(fz::datetime::utc, 2000, 2, 23, 15, 9, 55) }, DEFAULT }); @@ -772,7 +772,7 @@ R(_T("QSYS")), 0, O(), - CDateTime(CDateTime::utc, 2000, 2, 23, 15, 9, 55) + fz::datetime(fz::datetime::utc, 2000, 2, 23, 15, 9, 55) }, DEFAULT }); @@ -787,7 +787,7 @@ R(_T("longowner longgroup")), 0, O(), - CDateTime(CDateTime::utc, calcYear(2, 12), 2, 12, 17, 20) + fz::datetime(fz::datetime::utc, calcYear(2, 12), 2, 12, 17, 20) }, DEFAULT }); @@ -802,7 +802,7 @@ R(_T("owner group")), 0, O(), - CDateTime(CDateTime::utc, 1999, 6, 1) + fz::datetime(fz::datetime::utc, 1999, 6, 1) }, DEFAULT }); @@ -817,7 +817,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2004, 6, 3, 10, 20, 3) + fz::datetime(fz::datetime::utc, 2004, 6, 3, 10, 20, 3) }, DEFAULT }); @@ -832,7 +832,7 @@ R(), CDirentry::flag_dir | 0, O(), - CDateTime(CDateTime::utc, 1998, 2, 28, 5, 23, 30) + fz::datetime(fz::datetime::utc, 1998, 2, 28, 5, 23, 30) }, DEFAULT }); @@ -847,7 +847,7 @@ R(_T("B BCC3I1 7670")), 0, O(), - CDateTime(CDateTime::utc, calcYear(1, 13), 1, 13, 7, 42) + fz::datetime(fz::datetime::utc, calcYear(1, 13), 1, 13, 7, 42) }, DEFAULT }); @@ -863,7 +863,7 @@ R(_T("20.20")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2007, 3, 29) + fz::datetime(fz::datetime::utc, 2007, 3, 29) }, DEFAULT }); @@ -878,7 +878,7 @@ R(_T("user group")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2004, 10, 1) + fz::datetime(fz::datetime::utc, 2004, 10, 1) }, DEFAULT }); @@ -892,7 +892,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2005, 11, 11) + fz::datetime(fz::datetime::utc, 2005, 11, 11) }, DEFAULT }); @@ -907,7 +907,7 @@ R(_T("root sys")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2005, 1, 6) + fz::datetime(fz::datetime::utc, 2005, 1, 6) }, DEFAULT }); @@ -922,7 +922,7 @@ R(_T("QPGMR")), 0, O(), - CDateTime(CDateTime::utc, 2006, 9, 18, 14, 21, 26) + fz::datetime(fz::datetime::utc, 2006, 9, 18, 14, 21, 26) }, DEFAULT }); @@ -937,7 +937,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2005, 9, 23, 14, 57, 7) + fz::datetime(fz::datetime::utc, 2005, 9, 23, 14, 57, 7) }, DEFAULT }); @@ -952,7 +952,7 @@ R(_T("255, 0")), 0, O(), - CDateTime(CDateTime::utc, 2007, 4, 6, 14, 21, 18) + fz::datetime(fz::datetime::utc, 2007, 4, 6, 14, 21, 18) }, HPNONSTOP }); @@ -967,7 +967,7 @@ R(_T("255,255")), 0, O(), - CDateTime(CDateTime::utc, 2007, 4, 6, 14, 21, 18) + fz::datetime(fz::datetime::utc, 2007, 4, 6, 14, 21, 18) }, HPNONSTOP }); @@ -982,7 +982,7 @@ R(_T("user sys")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, calcYear(1, 30), 1, 30, 12, 40) + fz::datetime(fz::datetime::utc, calcYear(1, 30), 1, 30, 12, 40) }, DEFAULT }); @@ -1005,7 +1005,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2003, 5, 21) + fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT }); @@ -1019,7 +1019,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2004, 3, 04) + fz::datetime(fz::datetime::utc, 2004, 3, 04) }, DEFAULT }); @@ -1033,7 +1033,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1047,7 +1047,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2005, 6, 6) + fz::datetime(fz::datetime::utc, 2005, 6, 6) }, DEFAULT }); @@ -1061,7 +1061,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1082,7 +1082,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, MVS }); @@ -1097,7 +1097,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2004, 6, 22, 16, 32) + fz::datetime(fz::datetime::utc, 2004, 6, 22, 16, 32) }, MVS }); @@ -1112,7 +1112,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, MVS }); @@ -1126,7 +1126,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, MVS }); @@ -1141,7 +1141,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, MVS }); @@ -1173,7 +1173,7 @@ R(_T("060191")), 0, O(), - CDateTime(CDateTime::utc, 2005, 10, 4, 15, 28, 42) + fz::datetime(fz::datetime::utc, 2005, 10, 4, 15, 28, 42) }, ZVM }); @@ -1187,7 +1187,7 @@ R(_T("slopri devlab")), CDirentry::flag_dir, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1201,7 +1201,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2008, 11, 5, 16, 52, 15) + fz::datetime(fz::datetime::utc, 2008, 11, 5, 16, 52, 15) }, DEFAULT }); @@ -1219,7 +1219,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, MVS }); @@ -1233,7 +1233,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1247,7 +1247,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1261,7 +1261,7 @@ R(_T("1179 1179")), 0, O(), - CDateTime(CDateTime::utc, 2008, 4, 26, 13, 55, 1) + fz::datetime(fz::datetime::utc, 2008, 4, 26, 13, 55, 1) }, DEFAULT }); @@ -1275,7 +1275,7 @@ R(), CDirentry::flag_dir | CDirentry::flag_link, O(_T("/foo")), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1289,7 +1289,7 @@ R(), CDirentry::flag_dir | CDirentry::flag_link, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1304,7 +1304,7 @@ R(), 0, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1318,7 +1318,7 @@ R(), CDirentry::flag_dir | CDirentry::flag_link, O(), - CDateTime() + fz::datetime() }, DEFAULT }); @@ -1332,7 +1332,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2009, 7, 22, 9, 25, 10) + fz::datetime(fz::datetime::utc, 2009, 7, 22, 9, 25, 10) }, DEFAULT }); @@ -1348,7 +1348,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2003, 5, 21) + fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT }); @@ -1365,7 +1365,7 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 2011, 8, 25) + fz::datetime(fz::datetime::utc, 2011, 8, 25) }, DEFAULT }); @@ -1382,7 +1382,7 @@ R(), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, 2003, 5, 21) + fz::datetime(fz::datetime::utc, 2003, 5, 21) }, DEFAULT }); @@ -1396,7 +1396,7 @@ R(_T("0 0")), CDirentry::flag_dir, O(), - CDateTime(CDateTime::utc, calcYear(7, 29), 7, 29, 2, 27) + fz::datetime(fz::datetime::utc, calcYear(7, 29), 7, 29, 2, 27) }, DEFAULT }); @@ -1411,18 +1411,18 @@ R(), 0, O(), - CDateTime(CDateTime::utc, 1968, 11, 5, 16, 52, 15) + fz::datetime(fz::datetime::utc, 1968, 11, 5, 16, 52, 15) }, DEFAULT }); /* - fzstring name; + std::wstring name; int64_t size; - fzstring permissions; - fzstring ownerGroup; + std::wstring permissions; + std::wstring ownerGroup; int flags; - fzstring target; // Set to linktarget it link is true + std::wstring target; // Set to linktarget it link is true wxDateTime time; */ diff -Nru filezilla-3.14.1/tests/dispatch.cpp filezilla-3.15.0.2/tests/dispatch.cpp --- filezilla-3.14.1/tests/dispatch.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/dispatch.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -#include - -#include - -#include - -class DispatchTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(DispatchTest); - CPPUNIT_TEST(testSingle); - CPPUNIT_TEST(testArgs); - CPPUNIT_TEST(testMultiple); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() {} - void tearDown() {} - - void testSingle(); - void testArgs(); - void testMultiple(); -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(DispatchTest); - -namespace { -struct target { - - void a() { ++a_; } - void b() { ++b_; } - void c() { ++c_; } - - void two(int a, int b) - { - a_ += a; - b_ += b; - } - - int a_{}; - int b_{}; - int c_{}; -}; - -struct type1; -typedef CEvent T1; - -struct type2; -typedef CEvent T2; - -struct type3; -typedef CEvent T3; - -struct type4; -typedef CEvent T4; -} - -void DispatchTest::testSingle() -{ - target t; - - T1 const t1{}; - CPPUNIT_ASSERT(Dispatch(t1, &t, &target::a)); - CPPUNIT_ASSERT(Dispatch(t1, &t, &target::b)); - - T2 const t2{}; - CPPUNIT_ASSERT(!Dispatch(t2, &t, &target::b)); - - CPPUNIT_ASSERT_EQUAL(t.a_, 1); - CPPUNIT_ASSERT_EQUAL(t.b_, 1); -} - -void DispatchTest::testArgs() -{ - target t; - - T4 const t4(1, 5); - CPPUNIT_ASSERT(Dispatch(t4, &t, &target::two)); - - T3 const t3{}; - CPPUNIT_ASSERT(!Dispatch(t3, &t, &target::two)); - - CPPUNIT_ASSERT_EQUAL(t.a_, 1); - CPPUNIT_ASSERT_EQUAL(t.b_, 5); -} - -void DispatchTest::testMultiple() -{ - target t; - - T1 const t1{}; - T2 const t2{}; - T3 const t3{}; - T4 const t4(3, 8); - - CPPUNIT_ASSERT((Dispatch(t1, &t, &target::a, &target::b, &target::c))); - CPPUNIT_ASSERT((Dispatch(t2, &t, &target::a, &target::b, &target::c))); - CPPUNIT_ASSERT((Dispatch(t3, &t, &target::a, &target::b, &target::c))); - CPPUNIT_ASSERT((!Dispatch(t4, &t, &target::a, &target::b, &target::c))); - - CPPUNIT_ASSERT_EQUAL(t.a_, 1); - CPPUNIT_ASSERT_EQUAL(t.b_, 1); - CPPUNIT_ASSERT_EQUAL(t.c_, 1); - - CPPUNIT_ASSERT((Dispatch(t4, &t, &target::a, &target::two))); - - CPPUNIT_ASSERT_EQUAL(t.a_, 4); - CPPUNIT_ASSERT_EQUAL(t.b_, 9); -} diff -Nru filezilla-3.14.1/tests/eventloop.cpp filezilla-3.15.0.2/tests/eventloop.cpp --- filezilla-3.14.1/tests/eventloop.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/eventloop.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,212 +0,0 @@ -#include - -#include -#include - -#include - -class EventloopTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(EventloopTest); - CPPUNIT_TEST(testSimple); - CPPUNIT_TEST(testFilter); - CPPUNIT_TEST(testCondition); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() {} - void tearDown() {} - - void testSimple(); - void testFilter(); - void testCondition(); -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(EventloopTest); - -namespace { -struct type1; -typedef CEvent T1; - -struct type2; -typedef CEvent T2; - -struct type3; -typedef CEvent T3; - -struct type4; -typedef CEvent T4; - -class target : public CEventHandler -{ -public: - target(CEventLoop & l) - : CEventHandler(l) - {} - - virtual ~target() - { - RemoveHandler(); - } - - void a() - { - ++a_; - SendEvent(5); - } - - void b(int v) - { - ++b_; - - CPPUNIT_ASSERT_EQUAL(v, 5); - } - - void c() - { - SendEvent(); - } - - void d() - { - scoped_lock l(m_); - cond_.signal(l); - } - - virtual void operator()(CEventBase const& ev) override { - CPPUNIT_ASSERT((Dispatch(ev, this, &target::a, &target::b, &target::c, &target::d))); - } - - int a_{}; - int b_{}; - - - mutex m_; - condition cond_; -}; -} - -void EventloopTest::testSimple() -{ - CEventLoop loop; - - target t(loop); - - for (int i = 0; i < 1000; ++i) { - t.SendEvent(); - } - - t.SendEvent(); - - scoped_lock l(t.m_); - CPPUNIT_ASSERT(t.cond_.wait(l, 1000)); - - CPPUNIT_ASSERT_EQUAL(t.a_, 1000); - CPPUNIT_ASSERT_EQUAL(t.b_, 1000); -} - -namespace { -class target2 : public CEventHandler -{ -public: - target2(CEventLoop & l) - : CEventHandler(l) - {} - - virtual ~target2() - { - RemoveHandler(); - } - - void a() - { - { - scoped_lock l(m_); - CPPUNIT_ASSERT(cond2_.wait(l, 1000)); - } - - auto f = [&](CEventLoop::Events::value_type& ev) -> bool { - if (ev.second->derived_type() == T1::type()) { - ++c_; - return true; - } - - if (ev.second->derived_type() == T2::type()) { - ++d_; - std::get<0>(static_cast(*ev.second).v_) += 4; - } - return false; - - }; - event_loop_.FilterEvents(f); - ++a_; - } - - void b(int v) - { - b_ += v; - } - - void c() - { - scoped_lock l(m_); - cond_.signal(l); - } - - virtual void operator()(CEventBase const& ev) override { - CPPUNIT_ASSERT((Dispatch(ev, this, &target2::a, &target2::b, &target2::c))); - } - - int a_{}; - int b_{}; - int c_{}; - int d_{}; - - mutex m_; - condition cond_; - condition cond2_; -}; -} - -void EventloopTest::testFilter() -{ - CEventLoop loop; - - target2 t(loop); - - for (int i = 0; i < 10; ++i) { - t.SendEvent(); - } - t.SendEvent(3); - t.SendEvent(5); - - t.SendEvent(); - - scoped_lock l(t.m_); - t.cond2_.signal(l); - - CPPUNIT_ASSERT(t.cond_.wait(l, 1000)); - - CPPUNIT_ASSERT_EQUAL(t.a_, 1); - CPPUNIT_ASSERT_EQUAL(t.b_, 16); - CPPUNIT_ASSERT_EQUAL(t.c_, 9); - CPPUNIT_ASSERT_EQUAL(t.d_, 2); -} - -void EventloopTest::testCondition() -{ - // Make sure condition::wait works correctly. - - auto const t1 = CMonotonicClock::now(); - - mutex m; - condition c; - - scoped_lock l(m); - CPPUNIT_ASSERT(!c.wait(l, 200)); - - auto const t2 = CMonotonicClock::now(); - - // Due to rounding errors things can be off for one millisecond, allow it. - CPPUNIT_ASSERT((t2 - t1) >= duration::from_milliseconds(199)); -} diff -Nru filezilla-3.14.1/tests/ipaddress.cpp filezilla-3.15.0.2/tests/ipaddress.cpp --- filezilla-3.14.1/tests/ipaddress.cpp 2014-12-28 17:48:10.000000000 +0000 +++ filezilla-3.15.0.2/tests/ipaddress.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -#include -#include "directorylistingparser.h" -#include -#include - -/* - * This testsuite asserts the correctness of the - * functions handling IP addresses - */ - -class CIPAddressTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(CIPAddressTest); - CPPUNIT_TEST(testIsIpAddress); - CPPUNIT_TEST(testIPV6LongForm); - CPPUNIT_TEST(testIsRoutableAddress4); - CPPUNIT_TEST(testIsRoutableAddress6); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() {} - void tearDown() {} - - void testIsIpAddress(); - void testIPV6LongForm(); - void testIsRoutableAddress4(); - void testIsRoutableAddress6(); - -protected: -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(CIPAddressTest); - -void CIPAddressTest::testIsIpAddress() -{ - CPPUNIT_ASSERT(IsIpAddress(_T("255.255.255.255"))); - CPPUNIT_ASSERT(IsIpAddress(_T("127.0.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.0.0.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.-0.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.a.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.256.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.0.1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.0..1"))); - CPPUNIT_ASSERT(!IsIpAddress(_T("127.0..0.1"))); -} - -void CIPAddressTest::testIPV6LongForm() -{ - // Valid addresses - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("::1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("1234::1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0004:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("4::1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:abcd:0000:0000:0000:0000:1234:ef01"), GetIPV6LongForm(_T("1234:abcd::1234:ef01")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:abcd:0000:0000:0000:0000:1234:ef01"), GetIPV6LongForm(_T("1234:ABCD::1234:ef01")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("0:0:0:0:0:0:0:1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("0:0:0::0:0:0:0:1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("::0:0:0:0:0:0:0:1")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("0000:0000:0000:0000:0000:0000:0000:0001")) ); - - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[::1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[1234::1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0004:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[4::1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:abcd:0000:0000:0000:0000:1234:ef01"), GetIPV6LongForm(_T("[1234:abcd::1234:ef01]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("1234:abcd:0000:0000:0000:0000:1234:ef01"), GetIPV6LongForm(_T("[1234:ABCD::1234:ef01]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[0:0:0:0:0:0:0:1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[0:0:0::0:0:0:0:1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[::0:0:0:0:0:0:0:1]")) ); - CPPUNIT_ASSERT_EQUAL( wxString("0000:0000:0000:0000:0000:0000:0000:0001"), GetIPV6LongForm(_T("[0000:0000:0000:0000:0000:0000:0000:0001]")) ); - - // Invalid ones - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("::"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T(":::"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T(":1234:abcd::1234:ef01"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("1234:abcd::1234:ef01:"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("1234:abcd::1234::ef01"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("[1234:abcd::1234::ef01"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("1234:abcd::1234::ef01]"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("[[1234:abcd::1234::ef01]]"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("1234:abcde:1234::ef01"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("1234:abcg:1234::ef01"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T(":::1"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("0:0:0:0:0:0:0:1:2"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("0:0:0:0:0:0:0:1:2:0:0:0:0:0:0:1:2"))); - CPPUNIT_ASSERT_EQUAL( wxString(), GetIPV6LongForm(_T("0::0:0:0:0:0:0:1:2:0:0:0:0:0:0:1"))); -} - -void CIPAddressTest::testIsRoutableAddress4() -{ - // 127.0.0.0/8 - CPPUNIT_ASSERT(IsRoutableAddress(_T("126.255.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.0.0.0"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.255.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("128.0.0.0"), CSocket::ipv4)); - - // 10.0.0.0/8 - CPPUNIT_ASSERT(IsRoutableAddress(_T("9.255.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.0.0.0"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.255.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("11.0.0.0"), CSocket::ipv4)); - - // 169.254.0.0/16 - CPPUNIT_ASSERT(IsRoutableAddress(_T("169.253.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.0.0"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("169.255.0.0"), CSocket::ipv4)); - - // 192.168.0.0/16 - CPPUNIT_ASSERT(IsRoutableAddress(_T("192.167.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.0.0"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("102.169.0.0"), CSocket::ipv4)); - - // 172.16.0.0/20 - CPPUNIT_ASSERT(IsRoutableAddress(_T("172.15.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.16.0.0"), CSocket::ipv4)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.31.255.255"), CSocket::ipv4)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("172.32.0.0"), CSocket::ipv4)); -} - -void CIPAddressTest::testIsRoutableAddress6() -{ - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::1"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::0"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::2"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("1234:ABCD::1234:ef01"), CSocket::ipv6)); - - // fe80::/10 (link local) - CPPUNIT_ASSERT(IsRoutableAddress(_T("fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("fe80:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("fec0:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6)); - - // fc00::/7 (site local) - CPPUNIT_ASSERT(IsRoutableAddress(_T("fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("fc00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("fe00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6)); - - // IPv4 mapped - - // 127.0.0.0/8 - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:7eff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7f00:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7fff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:8000:0000"), CSocket::ipv6)); - - // 10.0.0.0/8 - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:9ff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0a00:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0aff:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:0b00:0000"), CSocket::ipv6)); - - // 169.254.0.0/16 - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9fd:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9ff:0000"), CSocket::ipv6)); - - // 192.168.0.0/16 - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a7:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a9:0000"), CSocket::ipv6)); - - // 172.16.0.0/20 - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac0f:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac10:0000"), CSocket::ipv6)); - CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac1f:ffff"), CSocket::ipv6)); - CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac20:0000"), CSocket::ipv6)); -} diff -Nru filezilla-3.14.1/tests/Makefile.am filezilla-3.15.0.2/tests/Makefile.am --- filezilla-3.14.1/tests/Makefile.am 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/Makefile.am 2016-02-05 08:54:46.000000000 +0000 @@ -6,20 +6,18 @@ test_SOURCES = test.cpp \ cmpnatural.cpp \ dirparsertest.cpp \ - dispatch.cpp \ - eventloop.cpp \ - ipaddress.cpp \ localpathtest.cpp \ - serverpathtest.cpp \ - time.cpp + serverpathtest.cpp test_CPPFLAGS = -I$(top_srcdir)/src/include test_CPPFLAGS += -I$(top_srcdir)/src/engine +test_CPPFLAGS += $(LIBFILEZILLA_CFLAGS) test_CPPFLAGS += $(WX_CPPFLAGS) test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS) test_LDFLAGS = $(CPPUNIT_LIBS) test_LDFLAGS += ../src/engine/libengine.a +test_LDFLAGS += $(LIBFILEZILLA_LIBS) test_LDFLAGS += $(LIBGNUTLS_LIBS) test_LDFLAGS += $(WX_LIBS) test_LDFLAGS += $(IDN_LIB) diff -Nru filezilla-3.14.1/tests/Makefile.in filezilla-3.15.0.2/tests/Makefile.in --- filezilla-3.14.1/tests/Makefile.in 2015-10-16 09:55:32.000000000 +0000 +++ filezilla-3.15.0.2/tests/Makefile.in 2016-02-10 19:38:52.000000000 +0000 @@ -109,10 +109,8 @@ CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = test$(EXEEXT) am_test_OBJECTS = test-test.$(OBJEXT) test-cmpnatural.$(OBJEXT) \ - test-dirparsertest.$(OBJEXT) test-dispatch.$(OBJEXT) \ - test-eventloop.$(OBJEXT) test-ipaddress.$(OBJEXT) \ - test-localpathtest.$(OBJEXT) test-serverpathtest.$(OBJEXT) \ - test-time.$(OBJEXT) + test-dirparsertest.$(OBJEXT) test-localpathtest.$(OBJEXT) \ + test-serverpathtest.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) test_LDADD = $(LDADD) AM_V_lt = $(am__v_lt_@AM_V@) @@ -435,6 +433,8 @@ 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@ @@ -557,18 +557,15 @@ test_SOURCES = test.cpp \ cmpnatural.cpp \ dirparsertest.cpp \ - dispatch.cpp \ - eventloop.cpp \ - ipaddress.cpp \ localpathtest.cpp \ - serverpathtest.cpp \ - time.cpp + serverpathtest.cpp test_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/engine \ - $(WX_CPPFLAGS) + $(LIBFILEZILLA_CFLAGS) $(WX_CPPFLAGS) test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS) test_LDFLAGS = $(CPPUNIT_LIBS) ../src/engine/libengine.a \ - $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) $(LIBSQLITE3_LIBS) + $(LIBFILEZILLA_LIBS) $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) \ + $(LIBSQLITE3_LIBS) test_DEPENDENCIES = ../src/engine/libengine.a all: all-am @@ -626,13 +623,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cmpnatural.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dirparsertest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dispatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-eventloop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ipaddress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localpathtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-serverpathtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -697,48 +690,6 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-dirparsertest.obj `if test -f 'dirparsertest.cpp'; then $(CYGPATH_W) 'dirparsertest.cpp'; else $(CYGPATH_W) '$(srcdir)/dirparsertest.cpp'; fi` -test-dispatch.o: dispatch.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-dispatch.o -MD -MP -MF $(DEPDIR)/test-dispatch.Tpo -c -o test-dispatch.o `test -f 'dispatch.cpp' || echo '$(srcdir)/'`dispatch.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-dispatch.Tpo $(DEPDIR)/test-dispatch.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dispatch.cpp' object='test-dispatch.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-dispatch.o `test -f 'dispatch.cpp' || echo '$(srcdir)/'`dispatch.cpp - -test-dispatch.obj: dispatch.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-dispatch.obj -MD -MP -MF $(DEPDIR)/test-dispatch.Tpo -c -o test-dispatch.obj `if test -f 'dispatch.cpp'; then $(CYGPATH_W) 'dispatch.cpp'; else $(CYGPATH_W) '$(srcdir)/dispatch.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-dispatch.Tpo $(DEPDIR)/test-dispatch.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dispatch.cpp' object='test-dispatch.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-dispatch.obj `if test -f 'dispatch.cpp'; then $(CYGPATH_W) 'dispatch.cpp'; else $(CYGPATH_W) '$(srcdir)/dispatch.cpp'; fi` - -test-eventloop.o: eventloop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-eventloop.o -MD -MP -MF $(DEPDIR)/test-eventloop.Tpo -c -o test-eventloop.o `test -f 'eventloop.cpp' || echo '$(srcdir)/'`eventloop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-eventloop.Tpo $(DEPDIR)/test-eventloop.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='eventloop.cpp' object='test-eventloop.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-eventloop.o `test -f 'eventloop.cpp' || echo '$(srcdir)/'`eventloop.cpp - -test-eventloop.obj: eventloop.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-eventloop.obj -MD -MP -MF $(DEPDIR)/test-eventloop.Tpo -c -o test-eventloop.obj `if test -f 'eventloop.cpp'; then $(CYGPATH_W) 'eventloop.cpp'; else $(CYGPATH_W) '$(srcdir)/eventloop.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-eventloop.Tpo $(DEPDIR)/test-eventloop.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='eventloop.cpp' object='test-eventloop.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-eventloop.obj `if test -f 'eventloop.cpp'; then $(CYGPATH_W) 'eventloop.cpp'; else $(CYGPATH_W) '$(srcdir)/eventloop.cpp'; fi` - -test-ipaddress.o: ipaddress.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-ipaddress.o -MD -MP -MF $(DEPDIR)/test-ipaddress.Tpo -c -o test-ipaddress.o `test -f 'ipaddress.cpp' || echo '$(srcdir)/'`ipaddress.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-ipaddress.Tpo $(DEPDIR)/test-ipaddress.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ipaddress.cpp' object='test-ipaddress.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-ipaddress.o `test -f 'ipaddress.cpp' || echo '$(srcdir)/'`ipaddress.cpp - -test-ipaddress.obj: ipaddress.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-ipaddress.obj -MD -MP -MF $(DEPDIR)/test-ipaddress.Tpo -c -o test-ipaddress.obj `if test -f 'ipaddress.cpp'; then $(CYGPATH_W) 'ipaddress.cpp'; else $(CYGPATH_W) '$(srcdir)/ipaddress.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-ipaddress.Tpo $(DEPDIR)/test-ipaddress.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ipaddress.cpp' object='test-ipaddress.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-ipaddress.obj `if test -f 'ipaddress.cpp'; then $(CYGPATH_W) 'ipaddress.cpp'; else $(CYGPATH_W) '$(srcdir)/ipaddress.cpp'; fi` - test-localpathtest.o: localpathtest.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-localpathtest.o -MD -MP -MF $(DEPDIR)/test-localpathtest.Tpo -c -o test-localpathtest.o `test -f 'localpathtest.cpp' || echo '$(srcdir)/'`localpathtest.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-localpathtest.Tpo $(DEPDIR)/test-localpathtest.Po @@ -767,20 +718,6 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-serverpathtest.obj `if test -f 'serverpathtest.cpp'; then $(CYGPATH_W) 'serverpathtest.cpp'; else $(CYGPATH_W) '$(srcdir)/serverpathtest.cpp'; fi` -test-time.o: time.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-time.o -MD -MP -MF $(DEPDIR)/test-time.Tpo -c -o test-time.o `test -f 'time.cpp' || echo '$(srcdir)/'`time.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-time.Tpo $(DEPDIR)/test-time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='time.cpp' object='test-time.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-time.o `test -f 'time.cpp' || echo '$(srcdir)/'`time.cpp - -test-time.obj: time.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -MT test-time.obj -MD -MP -MF $(DEPDIR)/test-time.Tpo -c -o test-time.obj `if test -f 'time.cpp'; then $(CYGPATH_W) 'time.cpp'; else $(CYGPATH_W) '$(srcdir)/time.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-time.Tpo $(DEPDIR)/test-time.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='time.cpp' object='test-time.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) $(test_CPPFLAGS) $(CPPFLAGS) $(test_CXXFLAGS) $(CXXFLAGS) -c -o test-time.obj `if test -f 'time.cpp'; then $(CYGPATH_W) 'time.cpp'; else $(CYGPATH_W) '$(srcdir)/time.cpp'; fi` - mostlyclean-libtool: -rm -f *.lo diff -Nru filezilla-3.14.1/tests/test.cpp filezilla-3.15.0.2/tests/test.cpp --- filezilla-3.14.1/tests/test.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/test.cpp 2016-02-05 08:54:46.000000000 +0000 @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff -Nru filezilla-3.14.1/tests/time.cpp filezilla-3.15.0.2/tests/time.cpp --- filezilla-3.14.1/tests/time.cpp 2015-10-16 09:55:04.000000000 +0000 +++ filezilla-3.15.0.2/tests/time.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -#include - -#include - -#include - -#include - -class TimeTest final : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(TimeTest); - CPPUNIT_TEST(testNow); - CPPUNIT_TEST(testPreEpoch); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() {} - void tearDown() {} - - void testNow(); - void testPreEpoch(); -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(TimeTest); - -void TimeTest::testNow() -{ - CDateTime const t1 = CDateTime::Now(); - -#ifdef __WXMSW__ - Sleep(2000); -#else - timespec ts{}; - ts.tv_sec = 2; - nanosleep(&ts, 0); -#endif - - CDateTime const t2 = CDateTime::Now(); - - CPPUNIT_ASSERT(t1.IsValid()); - CPPUNIT_ASSERT(t2.IsValid()); - CPPUNIT_ASSERT(t2 > t1); - - auto const diff = t2 - t1; - - CPPUNIT_ASSERT(diff.get_seconds() >= 2); - CPPUNIT_ASSERT(diff.get_seconds() < 4); // May fail if running on a computer for ants - - CPPUNIT_ASSERT(t1.GetTimeT() > 1431333788); // The time this test was written -} - -void TimeTest::testPreEpoch() -{ - CDateTime const now = CDateTime::Now(); - - CDateTime const t1(CDateTime::utc, 1957, 10, 4, 19, 28, 34); - - CPPUNIT_ASSERT(t1.IsValid()); - CPPUNIT_ASSERT(t1 < now); - - CPPUNIT_ASSERT(t1.GetTimeT() < -1); - - auto const tm1 = t1.GetTm(CDateTime::utc); - CPPUNIT_ASSERT_EQUAL(57, tm1.tm_year); - CPPUNIT_ASSERT_EQUAL(9, tm1.tm_mon); - CPPUNIT_ASSERT_EQUAL(4, tm1.tm_mday); - CPPUNIT_ASSERT_EQUAL(19, tm1.tm_hour); - CPPUNIT_ASSERT_EQUAL(28, tm1.tm_min); - CPPUNIT_ASSERT_EQUAL(34, tm1.tm_sec); - - - CDateTime const t2(CDateTime::utc, 1969, 12, 31, 23, 59, 59); - - CPPUNIT_ASSERT(t2.IsValid()); - CPPUNIT_ASSERT(t2 > t1); - CPPUNIT_ASSERT(t2 < now); - - auto const tm2 = t2.GetTm(CDateTime::utc); - CPPUNIT_ASSERT_EQUAL(69, tm2.tm_year); - CPPUNIT_ASSERT_EQUAL(11, tm2.tm_mon); - CPPUNIT_ASSERT_EQUAL(31, tm2.tm_mday); - CPPUNIT_ASSERT_EQUAL(23, tm2.tm_hour); - CPPUNIT_ASSERT_EQUAL(59, tm2.tm_min); - CPPUNIT_ASSERT_EQUAL(59, tm2.tm_sec); -}